Skip to content

Commit a4b29ab

Browse files
committed
Update basescript
1 parent b2efeb0 commit a4b29ab

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

docker-compose.yml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
version: '3'
22

33
services:
4-
proxy-web-auto:
4+
nginx-proxy-automation-web:
55
image: nginx:${NGINX_IMAGE_VERSION:-stable-alpine}
66
labels:
7-
com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true"
8-
container_name: ${NGINX_WEB_SEVICE_NAME:-proxy-web-auto}
7+
com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true"
8+
container_name: ${NGINX_WEB_SEVICE_NAME:-nginx-proxy-automation-web}
99
restart: always
1010
ports:
1111
- "${IPv4:-0.0.0.0}:${DOCKER_HTTP_:-80}:80"
1212
- "${IPv4:-0.0.0.0}:${DOCKER_HTTPS:-443}:443"
13-
## - "${IPv6:-::0}:${DOCKER_HTTP_:-80}:80"
14-
## - "${IPv6:-::0}:${DOCKER_HTTPS:-443}:443"
13+
# - "${IPv6:-::0}:${DOCKER_HTTP_:-80}:80"
14+
# - "${IPv6:-::0}:${DOCKER_HTTPS:-443}:443"
1515
environment:
1616
SSL_POLICY: ${SSL_POLICY:-Mozilla-Intermediate}
17-
## ENABLE_IPV6: "true"
17+
# ENABLE_IPV6: "true"
1818
volumes:
1919
- ${NGINX_FILES_PATH:-./data}/conf.d:/etc/nginx/conf.d
2020
- ${NGINX_FILES_PATH:-./data}/vhost.d:/etc/nginx/vhost.d
@@ -27,10 +27,10 @@ services:
2727
max-size: ${NGINX_WEB_LOG_MAX_SIZE:-4m}
2828
max-file: ${NGINX_WEB_LOG_MAX_FILE:-10}
2929

30-
docker-gen-auto:
30+
nginx-proxy-automation-gen:
3131
image: jwilder/docker-gen:${DOCKER_GEN_IMAGE_VERSION:-latest}
32-
command: -notify-sighup ${NGINX_WEB_SEVICE_NAME:-proxy-web-auto} -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
33-
container_name: ${DOCKER_GEN_SEVICE_NAME:-docker-gen-auto}
32+
command: -notify-sighup ${NGINX_WEB_SEVICE_NAME:-nginx-proxy-automation-web} -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
33+
container_name: ${DOCKER_GEN_SEVICE_NAME:-nginx-proxy-automation-gen}
3434
restart: always
3535
volumes:
3636
- ${NGINX_FILES_PATH:-./data}/conf.d:/etc/nginx/conf.d
@@ -46,9 +46,9 @@ services:
4646
max-size: ${NGINX_GEN_LOG_MAX_SIZE:-2m}
4747
max-file: ${NGINX_GEN_LOG_MAX_FILE:-10}
4848

49-
letsencrypt-auto:
49+
nginx-proxy-automation-letsencrypt:
5050
image: jrcs/letsencrypt-nginx-proxy-companion:${NGINX_PROXY_COMPANION_IMAGE_VERSION:-2.0}
51-
container_name: ${LETS_ENCRYPT_SEVICE_NAME:-letsencrypt-auto}
51+
container_name: ${LETS_ENCRYPT_SEVICE_NAME:-nginx-proxy-automation-letsencrypt}
5252
restart: always
5353
volumes:
5454
- ${NGINX_FILES_PATH:-./data}/conf.d:/etc/nginx/conf.d
@@ -58,8 +58,8 @@ services:
5858
- ${NGINX_FILES_PATH:-./data}/acme.sh:/etc/acme.sh
5959
- /var/run/docker.sock:/var/run/docker.sock:ro
6060
environment:
61-
NGINX_DOCKER_GEN_CONTAINER: ${DOCKER_GEN_SEVICE_NAME:-docker-gen-auto}
62-
NGINX_PROXY_CONTAINER: ${NGINX_WEB_SEVICE_NAME:-proxy-web-auto}
61+
NGINX_DOCKER_GEN_CONTAINER: ${DOCKER_GEN_SEVICE_NAME:-nginx-proxy-automation-gen}
62+
NGINX_PROXY_CONTAINER: ${NGINX_WEB_SEVICE_NAME:-nginx-proxy-automation-web}
6363
DEFAULT_EMAIL: ${DEFAULT_EMAIL:[email protected]}
6464
logging:
6565
driver: ${NGINX_LETSENCRYPT_LOG_DRIVER:-json-file}
@@ -71,3 +71,4 @@ networks:
7171
default:
7272
external:
7373
name: ${NETWORK:-proxy}
74+

0 commit comments

Comments
 (0)