diff --git a/configs/dev/traefik-v1.yml b/configs/dev/traefik-v1.yml deleted file mode 100644 index 813d059..0000000 --- a/configs/dev/traefik-v1.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -log: - level: "ERROR" - -providers: - docker: - endpoint: "unix:///var/run/docker.sock" - exposedByDefault: false - -api: - dashboard: true - debug: true - -entrypoints: - web: - address: ":80" - dashboard: - address: ":8080" diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 0396c49..72cda95 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -1,11 +1,19 @@ --- +version: "3.7" + services: traefik: container_name: traefik - configs: - - source: traefik-yml-dev - target: /etc/traefik/traefik.yml - -configs: - traefik-yml-dev: - file: ./config/dev/traefik-v1.yml + command: + - "--api=true" + - "--api.insecure=true" + - "--providers.docker=true" + - "--providers.docker.exposedbydefault=false" + - "--entrypoints.web.address=:80" + volumes: + - "/var/run/docker.sock:/var/run/docker.sock" + labels: + - "traefik.enable=true" + - "traefik.http.routers.traefik.rule=Host(`localhost`)" + - "traefik.http.routers.traefik.entrypoints=web" + - "traefik.http.routers.traefik.service=api@internal" diff --git a/docker-compose.production.yml b/docker-compose.production.yml index 71eb7e5..24055f1 100644 --- a/docker-compose.production.yml +++ b/docker-compose.production.yml @@ -1,9 +1,14 @@ --- +version: "3.7" + services: traefik: restart: always ports: - "443:443" + volumes: + - "/var/run/docker.sock:/var/run/docker.sock" + - "letsencrypt:/etc/letsencrypt" configs: - source: traefik-yml-prod target: /etc/traefik/traefik.yml @@ -32,3 +37,6 @@ networks: configs: traefik-yml-prod: file: ./config/prod/traefik-v1.yml + +volumes: + letsencrypt: diff --git a/docker-compose.yml b/docker-compose.yml index f9271b2..bd4144a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,15 +1,8 @@ --- -version: "3.8" +version: "3.7" services: traefik: image: "traefik:v2.2" ports: - "80:80" - - "8080:8080" - volumes: - - "/var/run/docker.sock:/var/run/docker.sock" - - "letsencrypt:/etc/letsencrypt" - -volumes: - letsencrypt: