From 05571024fc965b3ea2b407ffba9e92ec1b5d23ad Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Mon, 23 Sep 2024 19:26:34 +0200 Subject: [PATCH] add syncservice configuration --- docker-compose/7.1.N-docker-compose.yml | 7 +++++++ docker-compose/7.2.N-docker-compose.yml | 8 ++++++++ docker-compose/7.3.N-docker-compose.yml | 11 +++++++++-- docker-compose/7.4.N-docker-compose.yml | 7 +++++++ docker-compose/docker-compose.yml | 7 +++++++ 5 files changed, 38 insertions(+), 2 deletions(-) diff --git a/docker-compose/7.1.N-docker-compose.yml b/docker-compose/7.1.N-docker-compose.yml index 36f4d24b6..452b87593 100644 --- a/docker-compose/7.1.N-docker-compose.yml +++ b/docker-compose/7.1.N-docker-compose.yml @@ -196,6 +196,8 @@ services: - "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: @@ -216,6 +218,11 @@ services: -XX:MaxRAM=1g ports: - "9090:9090" + labels: + - "traefik.enable=true" + - "traefik.http.routers.syncservice.rule=PathPrefix(`/syncservice`)" + - "traefik.http.services.sync-service.loadbalancer.server.port=9090" + - "traefik.http.routers.syncservice.middlewares=syncservice@docker" volumes: shared-file-store-volume: driver_opts: diff --git a/docker-compose/7.2.N-docker-compose.yml b/docker-compose/7.2.N-docker-compose.yml index 5995a731c..b2fd960c4 100644 --- a/docker-compose/7.2.N-docker-compose.yml +++ b/docker-compose/7.2.N-docker-compose.yml @@ -211,6 +211,9 @@ services: - "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: @@ -231,6 +234,11 @@ services: -XX:MaxRAM=1g ports: - "9090:9090" + labels: + - "traefik.enable=true" + - "traefik.http.routers.syncservice.rule=PathPrefix(`/syncservice`)" + - "traefik.http.services.sync-service.loadbalancer.server.port=9090" + - "traefik.http.routers.syncservice.middlewares=syncservice@docker" volumes: shared-file-store-volume: driver_opts: diff --git a/docker-compose/7.3.N-docker-compose.yml b/docker-compose/7.3.N-docker-compose.yml index f7121e4a9..dd381eeea 100644 --- a/docker-compose/7.3.N-docker-compose.yml +++ b/docker-compose/7.3.N-docker-compose.yml @@ -77,7 +77,7 @@ services: http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file ports: - "8095:8095" - links: + depends_on: - activemq transform-core-aio: image: alfresco/alfresco-transform-core-aio:3.1.2 @@ -91,7 +91,7 @@ services: http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file ports: - "8090:8090" - links: + depends_on: - activemq shared-file-store: image: quay.io/alfresco/alfresco-shared-file-store:2.1.2 @@ -203,6 +203,8 @@ services: - "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 +224,11 @@ services: -XX:MaxRAMPercentage=80 ports: - "9090:9090" + labels: + - "traefik.enable=true" + - "traefik.http.routers.syncservice.rule=PathPrefix(`/syncservice`)" + - "traefik.http.services.sync-service.loadbalancer.server.port=9090" + - "traefik.http.routers.syncservice.middlewares=syncservice@docker" volumes: shared-file-store-volume: driver_opts: diff --git a/docker-compose/7.4.N-docker-compose.yml b/docker-compose/7.4.N-docker-compose.yml index 7307ab2b8..afd055cfd 100644 --- a/docker-compose/7.4.N-docker-compose.yml +++ b/docker-compose/7.4.N-docker-compose.yml @@ -204,6 +204,8 @@ services: - "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: @@ -223,6 +225,11 @@ services: -XX:MaxRAMPercentage=80 ports: - "9090:9090" + labels: + - "traefik.enable=true" + - "traefik.http.routers.syncservice.rule=PathPrefix(`/syncservice`)" + - "traefik.http.services.sync-service.loadbalancer.server.port=9090" + - "traefik.http.routers.syncservice.middlewares=syncservice@docker" volumes: shared-file-store-volume: driver_opts: diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index e388f09d5..ed4d1cd66 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -246,6 +246,8 @@ services: - "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: @@ -265,6 +267,11 @@ services: -XX:MaxRAMPercentage=80 ports: - "9090:9090" + labels: + - "traefik.enable=true" + - "traefik.http.routers.syncservice.rule=PathPrefix(`/syncservice`)" + - "traefik.http.services.sync-service.loadbalancer.server.port=9090" + - "traefik.http.routers.syncservice.middlewares=syncservice@docker" volumes: shared-file-store-volume: driver_opts: