From 2f65b0886e76c9a1231b4a0caa98849607cc6a30 Mon Sep 17 00:00:00 2001 From: Florian Zirker Date: Thu, 18 Mar 2021 16:15:52 +0100 Subject: [PATCH 1/3] Set default network in traefik command --- gitea/docker-compose.yaml | 1 - nextcloud/docker-compose.yaml | 2 -- proxy/docker-compose.yaml | 2 +- wallabag/docker-compose.yaml | 1 - www/docker-compose.yml | 2 +- 5 files changed, 2 insertions(+), 6 deletions(-) diff --git a/gitea/docker-compose.yaml b/gitea/docker-compose.yaml index 996044f..8aa1355 100644 --- a/gitea/docker-compose.yaml +++ b/gitea/docker-compose.yaml @@ -20,7 +20,6 @@ services: - "traefik.http.routers.gitea.tls.certresolver=myresolver" - "traefik.http.routers.gitea.tls.options=intermediate@file" - "traefik.http.services.gitea.loadbalancer.server.port=3000" - - "traefik.docker.network=web" - "docker.group=gitea" depends_on: - db diff --git a/nextcloud/docker-compose.yaml b/nextcloud/docker-compose.yaml index 66f2bcf..ccb5c10 100644 --- a/nextcloud/docker-compose.yaml +++ b/nextcloud/docker-compose.yaml @@ -19,7 +19,6 @@ services: - "traefik.http.routers.nextcloud.entrypoints=websecure" - "traefik.http.routers.nextcloud.tls.certresolver=myresolver" - "traefik.http.routers.nextcloud.tls.options=intermediate@file" - - "traefik.docker.network=web" - "traefik.http.middlewares.nextcloudHeader.headers.customRequestHeaders.X-Forwarded-Proto=https" - "traefik.http.middlewares.nextcloudHeader.headers.stsSeconds=15552000" - "traefik.http.middlewares.nextcloudHeader.headers.stsIncludeSubdomains=true" @@ -95,7 +94,6 @@ services: - "traefik.http.routers.office.entrypoints=websecure" - "traefik.http.routers.office.tls.certresolver=myresolver" - "traefik.http.routers.office.tls.options=intermediate@file" - - "traefik.docker.network=web" - "traefik.http.middlewares.officeHeader.headers.customRequestHeaders.X-Forwarded-Proto=https" - "traefik.http.middlewares.officeHeader.headers.stsSeconds=15552000" - "traefik.http.middlewares.officeHeader.headers.stsIncludeSubdomains=true" diff --git a/proxy/docker-compose.yaml b/proxy/docker-compose.yaml index 55e8f11..a3b6557 100644 --- a/proxy/docker-compose.yaml +++ b/proxy/docker-compose.yaml @@ -10,6 +10,7 @@ services: - "--api.dashboard=true" - "--providers.docker=true" - "--providers.docker.exposedbydefault=false" + - "--providers.docker.network=web" #- "--log.level=DEBUG" - "--entrypoints.web.address=:80" - "--entrypoints.web.http.redirections.entrypoint.to=websecure" @@ -38,7 +39,6 @@ services: - "traefik.http.routers.dashboard.tls.options=intermediate@file" - "traefik.http.routers.dashboard.middlewares=auth" - "traefik.http.middlewares.auth.basicauth.users=${HTPASSWD}" - - "traefik.docker.network=web" - "docker.group=web" diff --git a/wallabag/docker-compose.yaml b/wallabag/docker-compose.yaml index b03be2c..ec1f3af 100644 --- a/wallabag/docker-compose.yaml +++ b/wallabag/docker-compose.yaml @@ -28,7 +28,6 @@ services: - "traefik.http.routers.wallabag.entrypoints=websecure" - "traefik.http.routers.wallabag.tls.certresolver=myresolver" - "traefik.http.routers.wallabag.tls.options=intermediate@file" - - "traefik.docker.network=web" - "docker.group=wallabag" depends_on: - db diff --git a/www/docker-compose.yml b/www/docker-compose.yml index 95c9811..50d3c5f 100644 --- a/www/docker-compose.yml +++ b/www/docker-compose.yml @@ -15,7 +15,7 @@ services: - "traefik.http.routers.web-secure.rule=Host(`${DOMAIN}`) || Host(`www.${DOMAIN}`)" - "traefik.http.routers.web-secure.tls.certresolver=myresolver" - "traefik.http.routers.web-secure.tls.options=intermediate@file" - - "traefik.docker.network=web" + - "docker.group=www" networks: From 1ec58a10d4669cfdf41ffbff7b1a7a009494937b Mon Sep 17 00:00:00 2001 From: Florian Zirker Date: Thu, 18 Mar 2021 16:21:15 +0100 Subject: [PATCH 2/3] Removed docker.group label, becaus it is not used --- gitea/docker-compose.yaml | 1 - nextcloud/docker-compose.yaml | 2 -- proxy/docker-compose.yaml | 2 -- wallabag/docker-compose.yaml | 1 - www/docker-compose.yml | 2 -- 5 files changed, 8 deletions(-) diff --git a/gitea/docker-compose.yaml b/gitea/docker-compose.yaml index 8aa1355..aa14649 100644 --- a/gitea/docker-compose.yaml +++ b/gitea/docker-compose.yaml @@ -20,7 +20,6 @@ services: - "traefik.http.routers.gitea.tls.certresolver=myresolver" - "traefik.http.routers.gitea.tls.options=intermediate@file" - "traefik.http.services.gitea.loadbalancer.server.port=3000" - - "docker.group=gitea" depends_on: - db restart: unless-stopped diff --git a/nextcloud/docker-compose.yaml b/nextcloud/docker-compose.yaml index ccb5c10..10c0596 100644 --- a/nextcloud/docker-compose.yaml +++ b/nextcloud/docker-compose.yaml @@ -25,7 +25,6 @@ services: - "traefik.http.middlewares.nextcloudHeader.headers.stsPreload=true" - "traefik.http.middlewares.nextcloudHeader.headers.forceSTSHeader=true" - "traefik.http.routers.nextcloud.middlewares=nextcloudHeader" - - "docker.group=nextcloud" app: image: nextcloud:20-fpm @@ -100,7 +99,6 @@ services: - "traefik.http.middlewares.officeHeader.headers.stsPreload=true" - "traefik.http.middlewares.officeHeader.headers.forceSTSHeader=true" - "traefik.http.routers.office.middlewares=officeHeader" - - "docker.group=nextcloud" networks: diff --git a/proxy/docker-compose.yaml b/proxy/docker-compose.yaml index a3b6557..002a577 100644 --- a/proxy/docker-compose.yaml +++ b/proxy/docker-compose.yaml @@ -39,7 +39,6 @@ services: - "traefik.http.routers.dashboard.tls.options=intermediate@file" - "traefik.http.routers.dashboard.middlewares=auth" - "traefik.http.middlewares.auth.basicauth.users=${HTPASSWD}" - - "docker.group=web" # whoami: @@ -51,7 +50,6 @@ services: # - "traefik.http.routers.whoami.rule=Host(`whoami.${DOMAIN}`)" # - "traefik.http.routers.whoami.entrypoints=websecure" # - "traefik.http.routers.whoami.tls.certresolver=myresolver" -# - "docker.group=web" # restart: unless-stopped diff --git a/wallabag/docker-compose.yaml b/wallabag/docker-compose.yaml index ec1f3af..b60d551 100644 --- a/wallabag/docker-compose.yaml +++ b/wallabag/docker-compose.yaml @@ -28,7 +28,6 @@ services: - "traefik.http.routers.wallabag.entrypoints=websecure" - "traefik.http.routers.wallabag.tls.certresolver=myresolver" - "traefik.http.routers.wallabag.tls.options=intermediate@file" - - "docker.group=wallabag" depends_on: - db - redis diff --git a/www/docker-compose.yml b/www/docker-compose.yml index 50d3c5f..d4cc572 100644 --- a/www/docker-compose.yml +++ b/www/docker-compose.yml @@ -16,8 +16,6 @@ services: - "traefik.http.routers.web-secure.tls.certresolver=myresolver" - "traefik.http.routers.web-secure.tls.options=intermediate@file" - - "docker.group=www" - networks: web: external: true From 7279abb9b042d34073a3aafa5d446f327611eca2 Mon Sep 17 00:00:00 2001 From: Florian Zirker Date: Thu, 18 Mar 2021 16:24:31 +0100 Subject: [PATCH 3/3] .yml -> .yaml --- www/{docker-compose.yml => docker-compose.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename www/{docker-compose.yml => docker-compose.yaml} (100%) diff --git a/www/docker-compose.yml b/www/docker-compose.yaml similarity index 100% rename from www/docker-compose.yml rename to www/docker-compose.yaml