Skip to content

Commit 4e32004

Browse files
committed
default values for variables
1 parent 6d1ef20 commit 4e32004

File tree

3 files changed

+36
-34
lines changed

3 files changed

+36
-34
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
.env
1+
data
2+
.env*
3+
!.env.sample

docker-compose-multiple-networks.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ services:
77
container_name: ${NGINX_WEB:-nginx-web}
88
restart: always
99
ports:
10-
- "${IP}:80:80"
11-
- "${IP}:443:443"
10+
- "${IP:-0.0.0.0}:80:80"
11+
- "${IP:-0.0.0.0}:443:443"
1212
volumes:
13-
- ${NGINX_FILES_PATH:-data}/conf.d:/etc/nginx/conf.d
14-
- ${NGINX_FILES_PATH:-data}/vhost.d:/etc/nginx/vhost.d
15-
- ${NGINX_FILES_PATH:-data}/html:/usr/share/nginx/html
16-
- ${NGINX_FILES_PATH:-data}/certs:/etc/nginx/certs:ro
17-
- ${NGINX_FILES_PATH:-data}/htpasswd:/etc/nginx/htpasswd:ro
13+
- ${NGINX_FILES_PATH:-./data}/conf.d:/etc/nginx/conf.d
14+
- ${NGINX_FILES_PATH:-./data}/vhost.d:/etc/nginx/vhost.d
15+
- ${NGINX_FILES_PATH:-./data}/html:/usr/share/nginx/html
16+
- ${NGINX_FILES_PATH:-./data}/certs:/etc/nginx/certs:ro
17+
- ${NGINX_FILES_PATH:-./data}/htpasswd:/etc/nginx/htpasswd:ro
1818
networks:
1919
- default
2020
- outside
@@ -29,11 +29,11 @@ services:
2929
container_name: ${DOCKER_GEN:-nginx-gen}
3030
restart: always
3131
volumes:
32-
- ${NGINX_FILES_PATH:-data}/conf.d:/etc/nginx/conf.d
33-
- ${NGINX_FILES_PATH:-data}/vhost.d:/etc/nginx/vhost.d
34-
- ${NGINX_FILES_PATH:-data}/html:/usr/share/nginx/html
35-
- ${NGINX_FILES_PATH:-data}/certs:/etc/nginx/certs:ro
36-
- ${NGINX_FILES_PATH:-data}/htpasswd:/etc/nginx/htpasswd:ro
32+
- ${NGINX_FILES_PATH:-./data}/conf.d:/etc/nginx/conf.d
33+
- ${NGINX_FILES_PATH:-./data}/vhost.d:/etc/nginx/vhost.d
34+
- ${NGINX_FILES_PATH:-./data}/html:/usr/share/nginx/html
35+
- ${NGINX_FILES_PATH:-./data}/certs:/etc/nginx/certs:ro
36+
- ${NGINX_FILES_PATH:-./data}/htpasswd:/etc/nginx/htpasswd:ro
3737
- /var/run/docker.sock:/tmp/docker.sock:ro
3838
- ./nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl:ro
3939
networks:
@@ -49,10 +49,10 @@ services:
4949
container_name: ${LETS_ENCRYPT:-nginx-letsencrpt}
5050
restart: always
5151
volumes:
52-
- ${NGINX_FILES_PATH:-data}/conf.d:/etc/nginx/conf.d
53-
- ${NGINX_FILES_PATH:-data}/vhost.d:/etc/nginx/vhost.d
54-
- ${NGINX_FILES_PATH:-data}/html:/usr/share/nginx/html
55-
- ${NGINX_FILES_PATH:-data}/certs:/etc/nginx/certs:rw
52+
- ${NGINX_FILES_PATH:-./data}/conf.d:/etc/nginx/conf.d
53+
- ${NGINX_FILES_PATH:-./data}/vhost.d:/etc/nginx/vhost.d
54+
- ${NGINX_FILES_PATH:-./data}/html:/usr/share/nginx/html
55+
- ${NGINX_FILES_PATH:-./data}/certs:/etc/nginx/certs:rw
5656
- /var/run/docker.sock:/var/run/docker.sock:ro
5757
environment:
5858
NGINX_DOCKER_GEN_CONTAINER: ${DOCKER_GEN:-nginx-gen}
@@ -71,4 +71,4 @@ networks:
7171
name: ${NETWORK:-webproxy}
7272
outside:
7373
external:
74-
name: ${SERVICE_NETWORK}
74+
name: ${SERVICE_NETWORK:-webservices}

docker-compose.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ services:
77
container_name: ${NGINX_WEB:-nginx-web}
88
restart: always
99
ports:
10-
- "${IP}:80:80"
11-
- "${IP}:443:443"
10+
- "${IP:-0.0.0.0}:80:80"
11+
- "${IP:-0.0.0.0}:443:443"
1212
volumes:
13-
- ${NGINX_FILES_PATH:-data}/conf.d:/etc/nginx/conf.d
14-
- ${NGINX_FILES_PATH:-data}/vhost.d:/etc/nginx/vhost.d
15-
- ${NGINX_FILES_PATH:-data}/html:/usr/share/nginx/html
16-
- ${NGINX_FILES_PATH:-data}/certs:/etc/nginx/certs:ro
17-
- ${NGINX_FILES_PATH:-data}/htpasswd:/etc/nginx/htpasswd:ro
13+
- ${NGINX_FILES_PATH:-./data}/conf.d:/etc/nginx/conf.d
14+
- ${NGINX_FILES_PATH:-./data}/vhost.d:/etc/nginx/vhost.d
15+
- ${NGINX_FILES_PATH:-./data}/html:/usr/share/nginx/html
16+
- ${NGINX_FILES_PATH:-./data}/certs:/etc/nginx/certs:ro
17+
- ${NGINX_FILES_PATH:-./data}/htpasswd:/etc/nginx/htpasswd:ro
1818
logging:
1919
options:
2020
max-size: ${NGINX_WEB_LOG_MAX_SIZE:-4m}
@@ -26,11 +26,11 @@ services:
2626
container_name: ${DOCKER_GEN:-nginx-gen}
2727
restart: always
2828
volumes:
29-
- ${NGINX_FILES_PATH:-data}/conf.d:/etc/nginx/conf.d
30-
- ${NGINX_FILES_PATH:-data}/vhost.d:/etc/nginx/vhost.d
31-
- ${NGINX_FILES_PATH:-data}/html:/usr/share/nginx/html
32-
- ${NGINX_FILES_PATH:-data}/certs:/etc/nginx/certs:ro
33-
- ${NGINX_FILES_PATH:-data}/htpasswd:/etc/nginx/htpasswd:ro
29+
- ${NGINX_FILES_PATH:-./data}/conf.d:/etc/nginx/conf.d
30+
- ${NGINX_FILES_PATH:-./data}/vhost.d:/etc/nginx/vhost.d
31+
- ${NGINX_FILES_PATH:-./data}/html:/usr/share/nginx/html
32+
- ${NGINX_FILES_PATH:-./data}/certs:/etc/nginx/certs:ro
33+
- ${NGINX_FILES_PATH:-./data}/htpasswd:/etc/nginx/htpasswd:ro
3434
- /var/run/docker.sock:/tmp/docker.sock:ro
3535
- ./nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl:ro
3636
logging:
@@ -43,10 +43,10 @@ services:
4343
container_name: ${LETS_ENCRYPT:-nginx-letsencrypt}
4444
restart: always
4545
volumes:
46-
- ${NGINX_FILES_PATH:-data}/conf.d:/etc/nginx/conf.d
47-
- ${NGINX_FILES_PATH:-data}/vhost.d:/etc/nginx/vhost.d
48-
- ${NGINX_FILES_PATH:-data}/html:/usr/share/nginx/html
49-
- ${NGINX_FILES_PATH:-data}/certs:/etc/nginx/certs:rw
46+
- ${NGINX_FILES_PATH:-./data}/conf.d:/etc/nginx/conf.d
47+
- ${NGINX_FILES_PATH:-./data}/vhost.d:/etc/nginx/vhost.d
48+
- ${NGINX_FILES_PATH:-./data}/html:/usr/share/nginx/html
49+
- ${NGINX_FILES_PATH:-./data}/certs:/etc/nginx/certs:rw
5050
- /var/run/docker.sock:/var/run/docker.sock:ro
5151
environment:
5252
NGINX_DOCKER_GEN_CONTAINER: ${DOCKER_GEN:-nginx-gen}

0 commit comments

Comments
 (0)