bravo68web
/
docker-mirror
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2 from Gontier-Julien/restart-the-main-frame 

Just aesthetic and more logical placement for restart.
This commit is contained in:
Nico 2022-10-30 19:04:41 +01:00 committed by GitHub
parent 803cdd50ab ffdfeaa529
commit 43c3d64438
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker-compose-tunnels.yml
View File

@ -3,12 +3,12 @@ services:
nginx: nginx:
image: nginx:mainline-alpine image: nginx:mainline-alpine
container_name: nginx container_name: nginx
restart: ${RESTART:-unless-stopped}
hostname: ${DOMAIN_NAME:?err} hostname: ${DOMAIN_NAME:?err}
volumes: volumes:
- './http-root:/var/lib/nginx/html/http-root:ro' - './http-root:/var/lib/nginx/html/http-root:ro'
- './preset/nginx.conf:/etc/nginx/nginx.conf:ro' - './preset/nginx.conf:/etc/nginx/nginx.conf:ro'
- './preset/conf.d-tunnels:/etc/nginx/conf.d:ro' - './preset/conf.d-tunnels:/etc/nginx/conf.d:ro'
restart: ${RESTART:-unless-stopped}
syncthing: syncthing:
image: syncthing/syncthing:latest image: syncthing/syncthing:latest
@ -31,8 +31,8 @@ services:
image: erisamoe/cloudflared:latest image: erisamoe/cloudflared:latest
container_name: cloudflared container_name: cloudflared
command: --origincert /root/.cloudflared/cert.pem tunnel run --url http://nginx ${DOMAIN_NAME:?err} command: --origincert /root/.cloudflared/cert.pem tunnel run --url http://nginx ${DOMAIN_NAME:?err}
restart: ${RESTART:-unless-stopped}
volumes: volumes:
- './data/cloudflared/etc:/etc/cloudflared' - './data/cloudflared/etc:/etc/cloudflared'
- './data/cloudflared/home:/root' - './data/cloudflared/home:/root'
- './preset/passwd:/etc/passwd' - './preset/passwd:/etc/passwd'
restart: ${RESTART:-unless-stopped}

4
docker-compose.yml
View File

@ -3,7 +3,6 @@ services:
nginx: nginx:
image: nginx:mainline-alpine image: nginx:mainline-alpine
container_name: nginx container_name: nginx
restart: ${RESTART:-unless-stopped}
hostname: ${DOMAIN_NAME:?err} hostname: ${DOMAIN_NAME:?err}
volumes: volumes:
- './http-root:/var/lib/nginx/html/http-root:ro' - './http-root:/var/lib/nginx/html/http-root:ro'
@ -18,6 +17,7 @@ services:
ports: ports:
- '80:80' - '80:80'
- '443:443' - '443:443'
restart: ${RESTART:-unless-stopped}
syncthing: syncthing:
image: syncthing/syncthing:latest image: syncthing/syncthing:latest
@ -39,9 +39,9 @@ services:
certbot: certbot:
image: certbot/certbot:${LETSENCRYPT_TAG:-latest} image: certbot/certbot:${LETSENCRYPT_TAG:-latest}
container_name: certbot container_name: certbot
restart: ${RESTART:-unless-stopped}
volumes: volumes:
- './data/acme-webroot:/srv/http/webroot' - './data/acme-webroot:/srv/http/webroot'
- './data/letsencrypt/etc:/etc/letsencrypt' - './data/letsencrypt/etc:/etc/letsencrypt'
- './data/letsencrypt/var:/var/lib/letsencrypt' - './data/letsencrypt/var:/var/lib/letsencrypt'
entrypoint: "/bin/sh -c 'trap exit TERM; sleep 10; while :; do certbot renew -w /srv/http/webroot/ --webroot; sleep 12h & wait $${!}; done;'" entrypoint: "/bin/sh -c 'trap exit TERM; sleep 10; while :; do certbot renew -w /srv/http/webroot/ --webroot; sleep 12h & wait $${!}; done;'"
restart: ${RESTART:-unless-stopped}