diff --git a/gitea/docker-compose.yaml b/gitea/docker-compose.yaml index aa14649..996044f 100644 --- a/gitea/docker-compose.yaml +++ b/gitea/docker-compose.yaml @@ -20,6 +20,8 @@ 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 restart: unless-stopped diff --git a/nextcloud/docker-compose.yaml b/nextcloud/docker-compose.yaml index 10c0596..66f2bcf 100644 --- a/nextcloud/docker-compose.yaml +++ b/nextcloud/docker-compose.yaml @@ -19,12 +19,14 @@ 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" - "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 @@ -93,12 +95,14 @@ 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" - "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 002a577..55e8f11 100644 --- a/proxy/docker-compose.yaml +++ b/proxy/docker-compose.yaml @@ -10,7 +10,6 @@ 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" @@ -39,6 +38,8 @@ 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" # whoami: @@ -50,6 +51,7 @@ 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 b60d551..b03be2c 100644 --- a/wallabag/docker-compose.yaml +++ b/wallabag/docker-compose.yaml @@ -28,6 +28,8 @@ 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 - redis diff --git a/www/docker-compose.yaml b/www/docker-compose.yml similarity index 89% rename from www/docker-compose.yaml rename to www/docker-compose.yml index d4cc572..95c9811 100644 --- a/www/docker-compose.yaml +++ b/www/docker-compose.yml @@ -15,6 +15,8 @@ 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: web: