diff --git a/docker-compose/7.1.N-docker-compose.yml b/docker-compose/7.1.N-docker-compose.yml index 452b87593..8d5e253cd 100644 --- a/docker-compose/7.1.N-docker-compose.yml +++ b/docker-compose/7.1.N-docker-compose.yml @@ -188,6 +188,7 @@ services: - "--entrypoints.web.address=:8080" - "--entryPoints.traefik.address=:8888" - "--accesslog=true" + - "--providers.docker.exposedByDefault=false" ports: - "8080:8080" - "8888:8888" diff --git a/docker-compose/7.2.N-docker-compose.yml b/docker-compose/7.2.N-docker-compose.yml index b2fd960c4..ba13ec86a 100644 --- a/docker-compose/7.2.N-docker-compose.yml +++ b/docker-compose/7.2.N-docker-compose.yml @@ -203,6 +203,7 @@ services: - "--entrypoints.web.address=:8080" - "--entryPoints.traefik.address=:8888" - "--accesslog=true" + - "--providers.docker.exposedByDefault=false" ports: - "8080:8080" - "8888:8888" diff --git a/docker-compose/7.3.N-docker-compose.yml b/docker-compose/7.3.N-docker-compose.yml index dd381eeea..c4d817df2 100644 --- 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 index afd055cfd..f8fa52b57 100644 --- a/docker-compose/7.4.N-docker-compose.yml +++ b/docker-compose/7.4.N-docker-compose.yml @@ -196,6 +196,7 @@ services: - "--entrypoints.web.address=:8080" - "--entryPoints.traefik.address=:8888" - "--accesslog=true" + - "--providers.docker.exposedByDefault=false" ports: - "8080:8080" - "8888:8888" diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index ed4d1cd66..053cd9e67 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -238,6 +238,7 @@ services: - "--entrypoints.web.address=:8080" - "--entryPoints.traefik.address=:8888" - "--accesslog=true" + - "--providers.docker.exposedByDefault=false" ports: - "8080:8080" - "8888:8888"