From 8b759e6e985f57347b29583df7c3ab0a2fb6e354 Mon Sep 17 00:00:00 2001 From: Yax <1949284+kianby@users.noreply.github.com> Date: Sat, 6 Nov 2021 15:35:05 +0100 Subject: [PATCH] traefik takes advantage of docker expose port --- baikal/docker-compose.baikal.yml | 1 - blog/docker-compose.blog.yml | 3 +-- dokuwiki/docker-compose.dokuwiki.yml | 3 +-- glances/docker-compose.glances.yml | 1 - netdata/docker-compose.netdata.yml | 3 +-- photo/docker-compose.photo.yml | 3 +-- posteio/docker-compose.posteio.yml | 3 ++- seafile/docker-compose.seafile.yml | 3 +-- selfoss/docker-compose.selfoss.yml | 3 +-- shaarli/docker-compose.shaarli.yml | 3 +-- wallabag/docker-compose.wallabag.yml | 8 +++----- 11 files changed, 12 insertions(+), 22 deletions(-) diff --git a/baikal/docker-compose.baikal.yml b/baikal/docker-compose.baikal.yml index 57e9a25..00fff7b 100644 --- a/baikal/docker-compose.baikal.yml +++ b/baikal/docker-compose.baikal.yml @@ -17,7 +17,6 @@ services: - traefik.http.routers.baikal.rule=Host(`${HOST_BAIKAL}.${DOMAIN}`) - traefik.http.routers.baikal.entrypoints=https - traefik.http.routers.baikal.tls=true - - traefik.http.services.baikal.loadbalancer.server.port=80 volumes: baikal_config: diff --git a/blog/docker-compose.blog.yml b/blog/docker-compose.blog.yml index 21efa75..5987024 100755 --- a/blog/docker-compose.blog.yml +++ b/blog/docker-compose.blog.yml @@ -25,5 +25,4 @@ services: - traefik.enable=true - traefik.http.routers.blog.rule=Host(`${HOST_BLOG}.${DOMAIN}`) - traefik.http.routers.blog.entrypoints=https - - traefik.http.routers.blog.tls=true - - traefik.http.services.blog.loadbalancer.server.port=80 + - traefik.http.routers.blog.tls=true diff --git a/dokuwiki/docker-compose.dokuwiki.yml b/dokuwiki/docker-compose.dokuwiki.yml index 1be4eec..e021fd4 100755 --- a/dokuwiki/docker-compose.dokuwiki.yml +++ b/dokuwiki/docker-compose.dokuwiki.yml @@ -18,7 +18,6 @@ services: - traefik.enable=true - traefik.http.routers.dokuwiki.rule=Host(`${HOST_DOKUWIKI}.${DOMAIN}`) - traefik.http.routers.dokuwiki.entrypoints=https - - traefik.http.routers.dokuwiki.tls=true - - traefik.http.services.dokuwiki.loadbalancer.server.port=80 + - traefik.http.routers.dokuwiki.tls=true diff --git a/glances/docker-compose.glances.yml b/glances/docker-compose.glances.yml index 744d433..6616c6b 100755 --- a/glances/docker-compose.glances.yml +++ b/glances/docker-compose.glances.yml @@ -18,7 +18,6 @@ services: - traefik.http.routers.glances.rule=Host(`${HOST_WWW}.${DOMAIN}`) && PathPrefix(`${PATH_GLANCES}`) - traefik.http.routers.glances.entrypoints=https - traefik.http.routers.glances.tls=true - - traefik.http.services.glances.loadbalancer.server.port=61208 - traefik.http.routers.glances.middlewares=glancesRedir,glancesPStrip - traefik.http.middlewares.glancesPStrip.stripprefix.prefixes=${PATH_GLANCES} - traefik.http.middlewares.glancesRedir.redirectregex.regex=^(.*)${PATH_GLANCES}$$ diff --git a/netdata/docker-compose.netdata.yml b/netdata/docker-compose.netdata.yml index e9ddb7f..965661c 100644 --- a/netdata/docker-compose.netdata.yml +++ b/netdata/docker-compose.netdata.yml @@ -30,8 +30,7 @@ services: - traefik.http.routers.netdata.entrypoints=https - traefik.http.routers.netdata.tls=true - traefik.http.routers.netdata.middlewares=auth - - traefik.http.middlewares.auth.basicauth.users=${BASIC_AUTH} - - traefik.http.services.netdata.loadbalancer.server.port=19999 + - traefik.http.middlewares.auth.basicauth.users=${BASIC_AUTH} healthcheck: disable: true docker-proxy: diff --git a/photo/docker-compose.photo.yml b/photo/docker-compose.photo.yml index 63da3c3..baa4f7f 100755 --- a/photo/docker-compose.photo.yml +++ b/photo/docker-compose.photo.yml @@ -29,8 +29,7 @@ services: - traefik.enable=true - traefik.http.routers.pigallery_config.rule=Host(`${HOST_PIGALLERY}.${DOMAIN}`) - traefik.http.routers.pigallery_config.entrypoints=https - - traefik.http.routers.pigallery_config.tls=true - - traefik.http.services.pigallery_config.loadbalancer.server.port=80 + - traefik.http.routers.pigallery_config.tls=true volumes: pigallerydb_data: diff --git a/posteio/docker-compose.posteio.yml b/posteio/docker-compose.posteio.yml index 839be28..a732e71 100644 --- a/posteio/docker-compose.posteio.yml +++ b/posteio/docker-compose.posteio.yml @@ -14,12 +14,13 @@ services: - "465:465" - "993:993" - "25:25" + expose: + - 80 labels: - traefik.enable=true - traefik.http.routers.posteio.rule=Host(`${HOST_MAIL}.${DOMAIN}`) - traefik.http.routers.posteio.entrypoints=https - traefik.http.routers.posteio.tls=true - - traefik.http.services.posteio.loadbalancer.server.port=80 networks: - srv healthcheck: diff --git a/seafile/docker-compose.seafile.yml b/seafile/docker-compose.seafile.yml index 974f348..d07c7bc 100755 --- a/seafile/docker-compose.seafile.yml +++ b/seafile/docker-compose.seafile.yml @@ -52,8 +52,7 @@ services: - traefik.enable=true - traefik.http.routers.seafile.rule=Host(`${HOST_SEAFILE}.${DOMAIN}`) - traefik.http.routers.seafile.entrypoints=https - - traefik.http.routers.seafile.tls=true - - traefik.http.services.seafile.loadbalancer.server.port=80 + - traefik.http.routers.seafile.tls=true volumes: seafile_db: diff --git a/selfoss/docker-compose.selfoss.yml b/selfoss/docker-compose.selfoss.yml index fa3c35b..b7747a6 100755 --- a/selfoss/docker-compose.selfoss.yml +++ b/selfoss/docker-compose.selfoss.yml @@ -15,8 +15,7 @@ services: - traefik.enable=true - traefik.http.routers.selfoss.rule=Host(`${HOST_SELFOSS}.${DOMAIN}`) - traefik.http.routers.selfoss.entrypoints=https - - traefik.http.routers.selfoss.tls=true - - traefik.http.services.selfoss.loadbalancer.server.port=8888 + - traefik.http.routers.selfoss.tls=true volumes: selfoss_data: diff --git a/shaarli/docker-compose.shaarli.yml b/shaarli/docker-compose.shaarli.yml index 3e638dd..e7ced22 100755 --- a/shaarli/docker-compose.shaarli.yml +++ b/shaarli/docker-compose.shaarli.yml @@ -16,8 +16,7 @@ services: - traefik.enable=true - traefik.http.routers.shaarli.rule=Host(`${HOST_SHAARLI}.${DOMAIN}`) - traefik.http.routers.shaarli.entrypoints=https - - traefik.http.routers.shaarli.tls=true - - traefik.http.services.shaarli.loadbalancer.server.port=80 + - traefik.http.routers.shaarli.tls=true volumes: shaarli-data: diff --git a/wallabag/docker-compose.wallabag.yml b/wallabag/docker-compose.wallabag.yml index e38648c..d9ad14e 100755 --- a/wallabag/docker-compose.wallabag.yml +++ b/wallabag/docker-compose.wallabag.yml @@ -3,15 +3,14 @@ version: '3' services: wallabag: container_name: wallabag - environment: image: wallabag/wallabag networks: - srv expose: - - 80 + - 80 volumes: - - wallabag_data:/var/www/wallabag/data:rw - - wallabag_images:/var/www/wallabag/web/assets/images:rw + - wallabag_data:/var/www/wallabag/data:rw + - wallabag_images:/var/www/wallabag/web/assets/images:rw environment: - SYMFONY__ENV__DOMAIN_NAME="https://${HOST_WALLABAG}.${DOMAIN}" - SYMFONY__ENV__FOSUSER_REGISTRATION=false @@ -20,7 +19,6 @@ services: - traefik.http.routers.wallabag.rule=Host(`${HOST_WALLABAG}.${DOMAIN}`) - traefik.http.routers.wallabag.entrypoints=https - traefik.http.routers.wallabag.tls=true - - traefik.http.services.wallabag.loadbalancer.server.port=80 volumes: wallabag_data: