|
|
|
@ -722,19 +722,10 @@ services:
|
|
|
|
image: nginx:latest
|
|
|
|
image: nginx:latest
|
|
|
|
restart: always
|
|
|
|
restart: always
|
|
|
|
volumes:
|
|
|
|
volumes:
|
|
|
|
- ./nginx/nginx.conf.template:/etc/nginx/nginx.conf.template
|
|
|
|
|
|
|
|
- ./nginx/proxy.conf.template:/etc/nginx/proxy.conf.template
|
|
|
|
|
|
|
|
- ./nginx/https.conf.template:/etc/nginx/https.conf.template
|
|
|
|
|
|
|
|
- ./nginx/conf.d:/etc/nginx/conf.d
|
|
|
|
|
|
|
|
- ./nginx/docker-entrypoint.sh:/docker-entrypoint-mount.sh
|
|
|
|
|
|
|
|
- ./nginx/ssl:/etc/ssl # cert dir (legacy)
|
|
|
|
|
|
|
|
- ./volumes/certbot/conf/live:/etc/letsencrypt/live # cert dir (with certbot container)
|
|
|
|
|
|
|
|
- ./volumes/certbot/conf:/etc/letsencrypt
|
|
|
|
|
|
|
|
- ./volumes/certbot/www:/var/www/html
|
|
|
|
|
|
|
|
entrypoint: [ 'sh', '-c', "cp /docker-entrypoint-mount.sh /docker-entrypoint.sh && sed -i 's/\r$$//' /docker-entrypoint.sh && chmod +x /docker-entrypoint.sh && /docker-entrypoint.sh" ]
|
|
|
|
entrypoint: [ 'sh', '-c', "cp /docker-entrypoint-mount.sh /docker-entrypoint.sh && sed -i 's/\r$$//' /docker-entrypoint.sh && chmod +x /docker-entrypoint.sh && /docker-entrypoint.sh" ]
|
|
|
|
environment:
|
|
|
|
environment:
|
|
|
|
NGINX_SERVER_NAME: ${NGINX_SERVER_NAME:-_}
|
|
|
|
NGINX_SERVER_NAME: ${NGINX_SERVER_NAME:-_}
|
|
|
|
NGINX_HTTPS_ENABLED: ${NGINX_HTTPS_ENABLED:-false}
|
|
|
|
NGINX_HTTPS_ENABLED: "false"
|
|
|
|
NGINX_SSL_PORT: ${NGINX_SSL_PORT:-443}
|
|
|
|
NGINX_SSL_PORT: ${NGINX_SSL_PORT:-443}
|
|
|
|
NGINX_PORT: ${NGINX_PORT:-80}
|
|
|
|
NGINX_PORT: ${NGINX_PORT:-80}
|
|
|
|
# You're required to add your own SSL certificates/keys to the `./nginx/ssl` directory
|
|
|
|
# You're required to add your own SSL certificates/keys to the `./nginx/ssl` directory
|
|
|
|
@ -752,7 +743,7 @@ services:
|
|
|
|
depends_on:
|
|
|
|
depends_on:
|
|
|
|
- api
|
|
|
|
- api
|
|
|
|
- web
|
|
|
|
- web
|
|
|
|
ports:
|
|
|
|
expose:
|
|
|
|
- '${EXPOSE_NGINX_PORT:-80}:${NGINX_PORT:-80}'
|
|
|
|
- '${EXPOSE_NGINX_PORT:-80}:${NGINX_PORT:-80}'
|
|
|
|
- '${EXPOSE_NGINX_SSL_PORT:-443}:${NGINX_SSL_PORT:-443}'
|
|
|
|
- '${EXPOSE_NGINX_SSL_PORT:-443}:${NGINX_SSL_PORT:-443}'
|
|
|
|
|
|
|
|
|
|
|
|
|