diff --git a/.env.docker b/.env.docker index 2b4eba197..b7094fb49 100644 --- a/.env.docker +++ b/.env.docker @@ -929,16 +929,10 @@ DOCKER_REDIS_PORT_EXTERNAL="${REDIS_PORT}" DOCKER_DB_PORT_EXTERNAL="${DB_PORT}" # Port that the web will listen on *outside* the container (e.g. the host machine) for HTTP traffic -DOCKER_WEB_HTTP_PORT_EXTERNAL="8080" +DOCKER_PROXY_PORT_EXTERNAL_HTTP="80" # Port that the web will listen on *outside* the container (e.g. the host machine) for HTTPS traffic -DOCKER_WEB_HTTPS_PORT_EXTERNAL="444" - -# Port that the web will listen on *outside* the container (e.g. the host machine) for HTTP traffic -DOCKER_PROXY_PORT_EXTERNAL_HTTP="8080" - -# Port that the web will listen on *outside* the container (e.g. the host machine) for HTTPS traffic -DOCKER_PROXY_PORT_EXTERNAL_HTTPS="444" +DOCKER_PROXY_PORT_EXTERNAL_HTTPS="443" # Path to the Docker socket on the *host* DOCKER_HOST_SOCKET_PATH="/var/run/docker.sock" diff --git a/docker-compose.yml b/docker-compose.yml index 3b131635f..888a65847 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,7 @@ services: proxy: image: nginxproxy/nginx-proxy:1.4 container_name: "${DOCKER_CONTAINER_NAME_PREFIX}-proxy" - #restart: unless-stopped + restart: unless-stopped volumes: - "${DOCKER_HOST_SOCKET_PATH}:/tmp/docker.sock:ro" - "${DOCKER_CONFIG_ROOT}/proxy/conf.d:/etc/nginx/conf.d" @@ -29,7 +29,7 @@ services: proxy-acme: image: nginxproxy/acme-companion container_name: "${DOCKER_CONTAINER_NAME_PREFIX}-proxy-acme" - #restart: unless-stopped + restart: unless-stopped environment: DEBUG: 0 DEFAULT_EMAIL: "${LETSENCRYPT_EMAIL}" @@ -67,9 +67,6 @@ services: com.github.nginx-proxy.nginx-proxy.keepalive: 30 com.github.nginx-proxy.nginx-proxy.http2.enable: true com.github.nginx-proxy.nginx-proxy.http3.enable: true - # ports: - # - "${DOCKER_WEB_HTTP_PORT_EXTERNAL}:80" - # - "${DOCKER_WEB_HTTPS_PORT_EXTERNAL}:443" depends_on: - db - redis