diff options
| author | jfederico <jesus@123it.ca> | 2021-04-08 14:38:03 -0400 |
|---|---|---|
| committer | jfederico <jesus@123it.ca> | 2021-04-08 14:38:03 -0400 |
| commit | a07cfd330c349273af343e82fb8581d6bcfc849e (patch) | |
| tree | 54163b03740154049c0b351cd28cac1f7c6c4a62 /docker-compose-dev.yml | |
| parent | e62fd6284be355d922e7623d1983b58fe7b6071c (diff) | |
| download | scalelite-run-itzks-a07cfd330c349273af343e82fb8581d6bcfc849e.tar.gz scalelite-run-itzks-a07cfd330c349273af343e82fb8581d6bcfc849e.tar.bz2 scalelite-run-itzks-a07cfd330c349273af343e82fb8581d6bcfc849e.zip | |
cleaned up nginx
Diffstat (limited to 'docker-compose-dev.yml')
| -rw-r--r-- | docker-compose-dev.yml | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 7418f0d..a356e14 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -53,15 +53,13 @@ services: entrypoint: "/bin/sh -c 'trap exit TERM; while :; do certbot renew; sleep 12h & wait $${!}; done;'" scalelite-proxy: - image: nginx:latest + image: nginx:1.18 container_name: scalelite-proxy restart: unless-stopped volumes: - ./data/proxy/nginx/log/:/var/log/nginx - - ./data/proxy/nginx/nginx.conf:/etc/nginx/nginx.conf - - ./data/proxy/nginx/sites-enabled:/etc/nginx/sites-enabled - - ./data/proxy/nginx/sites.template.${DOCKER_PROXY_NGINX_TEMPLATE:-scalelite-proxy}:/etc/nginx/sites-available/sites.template - - ./data/proxy/nginx/default/html/:/var/www/html + - ./data/proxy/nginx/sites.template.${DOCKER_PROXY_NGINX_TEMPLATE:-scalelite-proxy}:/etc/nginx/sites.template + - ./data/proxy/nginx/sites-common:/etc/nginx/sites-common - ./data/certbot/conf/:/etc/letsencrypt - ./data/certbot/www/:/var/www/certbot ports: @@ -73,7 +71,7 @@ services: - certbot - scalelite-api - scalelite-recordings - command: /bin/bash -c "envsubst '$$NGINX_HOSTNAME' < /etc/nginx/sites-available/sites.template > /etc/nginx/sites-enabled/sites.conf && exec nginx -g 'daemon off;'" + command: /bin/bash -c "envsubst '$$NGINX_HOSTNAME' < /etc/nginx/sites.template > /etc/nginx/conf.d/sites.conf && exec nginx -g 'daemon off;'" logging: driver: journald |