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