Move all traefik file in root path and flatten everything

This commit is contained in:
Jean Froment 2018-06-19 16:13:47 +02:00
parent c608bf5a14
commit fa1bb05f58
7 changed files with 25 additions and 32 deletions

View File

@ -1 +1,3 @@
TRAEFIK_DOMAIN=mydomain.com
ACME_MAIL=my-email@my-provider.com
PORTAINER_ADMIN_PASSWORD=h4ckMePleAse PORTAINER_ADMIN_PASSWORD=h4ckMePleAse

1
.gitignore vendored
View File

@ -2,5 +2,4 @@
/config /config
tunnel-options.sh tunnel-options.sh
traefik/.env
.env .env

View File

@ -2,7 +2,11 @@ version: '3'
networks: networks:
main: main:
webgateway:
driver: bridge
web:
external:
name: traefik_webgateway
volumes: volumes:
config: config:
driver: local-persist driver: local-persist
@ -28,6 +32,23 @@ services:
# env_file: # env_file:
# - config # - config
services:
traefik:
image: traefik
container_name: traefik
restart: always
networks:
- webgateway
command: --acme.email=${ACME_MAIL} --docker.domain=${TRAEFIK_DOMAIN}
ports:
- "80:80"
- "443:443"
- "8080:8080"
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- ./traefik.toml:/traefik.toml
- /opt/traefik/acme.json:/acme.json
deluge: deluge:
image: fromenje/seedbox:deluge image: fromenje/seedbox:deluge
build: Dockerfiles/deluge build: Dockerfiles/deluge
@ -122,13 +143,10 @@ services:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
networks: networks:
- web - web
env_file:
- .env
- traefik/.env
command: --admin-password ${PORTAINER_ADMIN_PASSWORD} --host=unix:///var/run/docker.sock command: --admin-password ${PORTAINER_ADMIN_PASSWORD} --host=unix:///var/run/docker.sock
labels: labels:
- 'traefik.backend=portainer' - 'traefik.backend=portainer'
- 'traefik.port=9000' - 'traefik.port=9000'
- 'traefik.frontend.rule=Host:portainer.${TRAEFIK_DOMAIN}' - 'traefik.frontend.rule=Host:portainer.${TRAEFIK_DOMAIN}'
- "traefik.enable=true" - 'traefik.enable=true'

View File

@ -1,2 +0,0 @@
ACME_MAIL=my-email@my-provider.com
TRAEFIK_DOMAIN=mydomain.com

View File

@ -1,24 +0,0 @@
version: '3'
services:
traefik:
image: traefik
container_name: traefik
restart: always
env_file:
- ./.env
networks:
- webgateway
command: --acme.email=${ACME_MAIL} --docker.domain=${TRAEFIK_DOMAIN}
ports:
- "80:80"
- "443:443"
- "8080:8080"
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- ./traefik.toml:/traefik.toml
- /opt/traefik/acme.json:/acme.json
networks:
webgateway:
driver: bridge