reorder labels top allow disabling exposing containers by default

Alfresco · Sep 23, 2024 · 8a10288 · 8a10288
1 parent 0557102
commit 8a10288
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 31 deletions.
diff --git a/docker-compose/7.1.N-docker-compose.yml b/docker-compose/7.1.N-docker-compose.yml
@@ -64,8 +64,10 @@ services:
       - "traefik.http.routers.alfresco.rule=PathPrefix(`/`)"
       - "traefik.http.services.alfresco.loadbalancer.server.port=8080"
       - "traefik.http.routers.solrapideny.rule=PathRegexp(`^/alfresco/(wc)?s(ervice)?/api/solr/`)"
+      - "traefik.http.middlewares.fakeauth.basicauth.users=test:"
       - "traefik.http.routers.solrapideny.middlewares=fakeauth@docker"
       - "traefik.http.routers.alfrescomicrometer.rule=PathRegexp(`^/alfresco/(wc)?s(ervice)?/prometheus`)"
+      - "traefik.http.middlewares.prometheusipfilter.ipallowlist.sourcerange=127.0.0.0/8"
       - "traefik.http.routers.alfrescomicrometer.middlewares=prometheusipfilter@docker"
   transform-router:
     mem_limit: 512m
@@ -178,6 +180,7 @@ services:
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.adw.rule=PathPrefix(`/workspace`)"
+      - "traefik.http.middlewares.adfroot.stripprefix.prefixes=/workspace"
       - "traefik.http.routers.adw.middlewares=adfroot@docker"
   proxy:
     image: traefik:v3.1.3
@@ -188,16 +191,11 @@ services:
       - "--entrypoints.web.address=:8080"
       - "--entryPoints.traefik.address=:8888"
       - "--accesslog=true"
+      - "--providers.docker.exposedByDefault=false"
     ports:
       - "8080:8080"
       - "8888:8888"
     privileged: true
-    labels:
-      - "traefik.http.middlewares.adfroot.stripprefix.prefixes=/workspace,/admin"
-      - "traefik.http.middlewares.fakeauth.basicauth.users=test:"
-      - "traefik.http.middlewares.prometheusipfilter.ipallowlist.sourcerange=127.0.0.0/8"
-      - "traefik.http.middlewares.syncservice.replacepathregex.regex=^/syncservice/(.*)"
-      - "traefik.http.middlewares.syncservice.replacepathregex.replacement=/alfresco/$$1"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
   sync-service:
@@ -222,6 +220,8 @@ services:
       - "traefik.enable=true"
       - "traefik.http.routers.syncservice.rule=PathPrefix(`/syncservice`)"
       - "traefik.http.services.sync-service.loadbalancer.server.port=9090"
+      - "traefik.http.middlewares.syncservice.replacepathregex.regex=^/syncservice/(.*)"
+      - "traefik.http.middlewares.syncservice.replacepathregex.replacement=/alfresco/$$1"
       - "traefik.http.routers.syncservice.middlewares=syncservice@docker"
 volumes:
   shared-file-store-volume:

diff --git a/docker-compose/7.2.N-docker-compose.yml b/docker-compose/7.2.N-docker-compose.yml
@@ -65,8 +65,10 @@ services:
       - "traefik.http.routers.alfresco.rule=PathPrefix(`/`)"
       - "traefik.http.services.alfresco.loadbalancer.server.port=8080"
       - "traefik.http.routers.solrapideny.rule=PathRegexp(`^/alfresco/(wc)?s(ervice)?/api/solr/`)"
+      - "traefik.http.middlewares.fakeauth.basicauth.users=test:"
       - "traefik.http.routers.solrapideny.middlewares=fakeauth@docker"
       - "traefik.http.routers.alfrescomicrometer.rule=PathRegexp(`^/alfresco/(wc)?s(ervice)?/prometheus`)"
+      - "traefik.http.middlewares.prometheusipfilter.ipallowlist.sourcerange=127.0.0.0/8"
       - "traefik.http.routers.alfrescomicrometer.middlewares=prometheusipfilter@docker"
   transform-router:
     mem_limit: 512m
@@ -182,6 +184,7 @@ services:
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.adw.rule=PathPrefix(`/workspace`)"
+      - "traefik.http.middlewares.adfroot.stripprefix.prefixes=/workspace,/admin"
       - "traefik.http.routers.adw.middlewares=adfroot@docker"
   control-center:
     image: quay.io/alfresco/alfresco-control-center:7.9.0
@@ -203,17 +206,11 @@ services:
       - "--entrypoints.web.address=:8080"
       - "--entryPoints.traefik.address=:8888"
       - "--accesslog=true"
+      - "--providers.docker.exposedByDefault=false"
     ports:
       - "8080:8080"
       - "8888:8888"
     privileged: true
-    labels:
-      - "traefik.http.middlewares.adfroot.stripprefix.prefixes=/workspace,/admin"
-      - "traefik.http.middlewares.fakeauth.basicauth.users=test:"
-      - "traefik.http.middlewares.prometheusipfilter.ipallowlist.sourcerange=127.0.0.0/8"
-      - "traefik.http.middlewares.syncservice.replacepathregex.regex=^/syncservice/(.*)"
-      - "traefik.http.middlewares.syncservice.replacepathregex.replacement=/alfresco/$$1"
-
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
   sync-service:
@@ -238,6 +235,8 @@ services:
       - "traefik.enable=true"
       - "traefik.http.routers.syncservice.rule=PathPrefix(`/syncservice`)"
       - "traefik.http.services.sync-service.loadbalancer.server.port=9090"
+      - "traefik.http.middlewares.syncservice.replacepathregex.regex=^/syncservice/(.*)"
+      - "traefik.http.middlewares.syncservice.replacepathregex.replacement=/alfresco/$$1"
       - "traefik.http.routers.syncservice.middlewares=syncservice@docker"
 volumes:
   shared-file-store-volume:

diff --git a/docker-compose/7.3.N-docker-compose.yml b/docker-compose/7.3.N-docker-compose.yml
@@ -61,8 +61,10 @@ services:
       - "traefik.http.routers.alfresco.rule=PathPrefix(`/`)"
       - "traefik.http.services.alfresco.loadbalancer.server.port=8080"
       - "traefik.http.routers.solrapideny.rule=PathRegexp(`^/alfresco/(wc)?s(ervice)?/api/solr/`)"
+      - "traefik.http.middlewares.fakeauth.basicauth.users=test:"
       - "traefik.http.routers.solrapideny.middlewares=fakeauth@docker"
       - "traefik.http.routers.alfrescomicrometer.rule=PathRegexp(`^/alfresco/(wc)?s(ervice)?/prometheus`)"
+      - "traefik.http.middlewares.prometheusipfilter.ipallowlist.sourcerange=127.0.0.0/8"
       - "traefik.http.routers.alfrescomicrometer.middlewares=prometheusipfilter@docker"
   transform-router:
     mem_limit: 512m
@@ -174,6 +176,7 @@ services:
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.adw.rule=PathPrefix(`/workspace`)"
+      - "traefik.http.middlewares.adfroot.stripprefix.prefixes=/workspace,/admin"
       - "traefik.http.routers.adw.middlewares=adfroot@docker"
   control-center:
     image: quay.io/alfresco/alfresco-control-center:7.9.0
@@ -195,16 +198,11 @@ services:
       - "--entrypoints.web.address=:8080"
       - "--entryPoints.traefik.address=:8888"
       - "--accesslog=true"
+      - "--providers.docker.exposedByDefault=false"
     ports:
       - "8080:8080"
       - "8888:8888"
     privileged: true
-    labels:
-      - "traefik.http.middlewares.adfroot.stripprefix.prefixes=/workspace,/admin"
-      - "traefik.http.middlewares.fakeauth.basicauth.users=test:"
-      - "traefik.http.middlewares.prometheusipfilter.ipallowlist.sourcerange=127.0.0.0/8"
-      - "traefik.http.middlewares.syncservice.replacepathregex.regex=^/syncservice/(.*)"
-      - "traefik.http.middlewares.syncservice.replacepathregex.replacement=/alfresco/$$1"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
   sync-service:
@@ -228,6 +226,8 @@ services:
       - "traefik.enable=true"
       - "traefik.http.routers.syncservice.rule=PathPrefix(`/syncservice`)"
       - "traefik.http.services.sync-service.loadbalancer.server.port=9090"
+      - "traefik.http.middlewares.syncservice.replacepathregex.regex=^/syncservice/(.*)"
+      - "traefik.http.middlewares.syncservice.replacepathregex.replacement=/alfresco/$$1"
       - "traefik.http.routers.syncservice.middlewares=syncservice@docker"
 volumes:
   shared-file-store-volume:

diff --git a/docker-compose/7.4.N-docker-compose.yml b/docker-compose/7.4.N-docker-compose.yml
@@ -61,7 +61,9 @@ services:
       - "traefik.http.routers.alfresco.rule=PathPrefix(`/`)"
       - "traefik.http.services.alfresco.loadbalancer.server.port=8080"
       - "traefik.http.routers.solrapideny.rule=PathRegexp(`^/alfresco/(wc)?s(ervice)?/api/solr/`)"
+      - "traefik.http.middlewares.fakeauth.basicauth.users=test:"
       - "traefik.http.routers.solrapideny.middlewares=fakeauth@docker"
+      - "traefik.http.middlewares.prometheusipfilter.ipallowlist.sourcerange=127.0.0.0/8"
       - "traefik.http.routers.alfrescomicrometer.rule=PathRegexp(`^/alfresco/(wc)?s(ervice)?/prometheus`)"
       - "traefik.http.routers.alfrescomicrometer.middlewares=prometheusipfilter@docker"
   transform-router:
@@ -175,6 +177,7 @@ services:
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.adw.rule=PathPrefix(`/workspace`)"
+      - "traefik.http.middlewares.adfroot.stripprefix.prefixes=/workspace,/admin"
       - "traefik.http.routers.adw.middlewares=adfroot@docker"
   control-center:
     image: quay.io/alfresco/alfresco-control-center:8.3.0
@@ -196,16 +199,11 @@ services:
       - "--entrypoints.web.address=:8080"
       - "--entryPoints.traefik.address=:8888"
       - "--accesslog=true"
+      - "--providers.docker.exposedByDefault=false"
     ports:
       - "8080:8080"
       - "8888:8888"
     privileged: true
-    labels:
-      - "traefik.http.middlewares.adfroot.stripprefix.prefixes=/workspace,/admin"
-      - "traefik.http.middlewares.fakeauth.basicauth.users=test:"
-      - "traefik.http.middlewares.prometheusipfilter.ipallowlist.sourcerange=127.0.0.0/8"
-      - "traefik.http.middlewares.syncservice.replacepathregex.regex=^/syncservice/(.*)"
-      - "traefik.http.middlewares.syncservice.replacepathregex.replacement=/alfresco/$$1"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
   sync-service:
@@ -229,6 +227,8 @@ services:
       - "traefik.enable=true"
       - "traefik.http.routers.syncservice.rule=PathPrefix(`/syncservice`)"
       - "traefik.http.services.sync-service.loadbalancer.server.port=9090"
+      - "traefik.http.middlewares.syncservice.replacepathregex.regex=^/syncservice/(.*)"
+      - "traefik.http.middlewares.syncservice.replacepathregex.replacement=/alfresco/$$1"
       - "traefik.http.routers.syncservice.middlewares=syncservice@docker"
 volumes:
   shared-file-store-volume:

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
@@ -69,8 +69,10 @@ services:
       - "traefik.http.routers.alfresco.rule=PathPrefix(`/`)"
       - "traefik.http.services.alfresco.loadbalancer.server.port=8080"
       - "traefik.http.routers.solrapideny.rule=PathRegexp(`^/alfresco/(wc)?s(ervice)?/api/solr/.*$`)"
+      - "traefik.http.middlewares.fakeauth.basicauth.users=test:"
       - "traefik.http.routers.solrapideny.middlewares=fakeauth@docker"
       - "traefik.http.routers.alfrescomicrometer.rule=PathRegexp(`^/alfresco/(wc)?s(ervice)?/prometheus`)"
+      - "traefik.http.middlewares.prometheusipfilter.ipallowlist.sourcerange=127.0.0.0/8"
       - "traefik.http.routers.alfrescomicrometer.middlewares=prometheusipfilter@docker"
   transform-router:
     mem_limit: 512m
@@ -217,6 +219,7 @@ services:
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.adw.rule=PathPrefix(`/workspace`)"
+      - "traefik.http.middlewares.adfroot.stripprefix.prefixes=/workspace,/admin"
       - "traefik.http.routers.adw.middlewares=adfroot@docker"
   control-center:
     image: quay.io/alfresco/alfresco-control-center:9.0.0
@@ -238,16 +241,11 @@ services:
       - "--entrypoints.web.address=:8080"
       - "--entryPoints.traefik.address=:8888"
       - "--accesslog=true"
+      - "--providers.docker.exposedByDefault=false"
     ports:
       - "8080:8080"
       - "8888:8888"
     privileged: true
-    labels:
-      - "traefik.http.middlewares.adfroot.stripprefix.prefixes=/workspace,/admin"
-      - "traefik.http.middlewares.fakeauth.basicauth.users=test:"
-      - "traefik.http.middlewares.prometheusipfilter.ipallowlist.sourcerange=127.0.0.0/8"
-      - "traefik.http.middlewares.syncservice.replacepathregex.regex=^/syncservice/(.*)"
-      - "traefik.http.middlewares.syncservice.replacepathregex.replacement=/alfresco/$$1"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
   sync-service:
@@ -271,6 +269,8 @@ services:
       - "traefik.enable=true"
       - "traefik.http.routers.syncservice.rule=PathPrefix(`/syncservice`)"
       - "traefik.http.services.sync-service.loadbalancer.server.port=9090"
+      - "traefik.http.middlewares.syncservice.replacepathregex.regex=^/syncservice/(.*)"
+      - "traefik.http.middlewares.syncservice.replacepathregex.replacement=/alfresco/$$1"
       - "traefik.http.routers.syncservice.middlewares=syncservice@docker"
 volumes:
   shared-file-store-volume: