From cc5083c4cbf37bb90d35c7d8c990b251371f7631 Mon Sep 17 00:00:00 2001 From: mmattel Date: Wed, 14 Aug 2024 15:53:31 +0200 Subject: [PATCH 1/4] [docs-only] Fix some ocis_full deployment stuff --- deployments/examples/ocis_full/collabora.yml | 2 ++ deployments/examples/ocis_full/docker-compose.yml | 3 +-- deployments/examples/ocis_full/onlyoffice.yml | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/deployments/examples/ocis_full/collabora.yml b/deployments/examples/ocis_full/collabora.yml index b766fba059..a05f4530cc 100644 --- a/deployments/examples/ocis_full/collabora.yml +++ b/deployments/examples/ocis_full/collabora.yml @@ -37,6 +37,8 @@ services: COLLABORATION_LOG_LEVEL: ${LOG_LEVEL:-info} volumes: - ocis-config:/etc/ocis + # configure the .env file to use own paths instead docker internal volumes + - ${OCIS_CONFIG_DIR:-ocis-config}:/etc/ocis labels: - "traefik.enable=true" - "traefik.http.routers.collaboration.entrypoints=https" diff --git a/deployments/examples/ocis_full/docker-compose.yml b/deployments/examples/ocis_full/docker-compose.yml index 0c34f64604..2e07f04eff 100644 --- a/deployments/examples/ocis_full/docker-compose.yml +++ b/deployments/examples/ocis_full/docker-compose.yml @@ -1,8 +1,7 @@ --- - services: traefik: - image: traefik:v3.0.3 + image: traefik:v3.1.2 networks: ocis-net: command: diff --git a/deployments/examples/ocis_full/onlyoffice.yml b/deployments/examples/ocis_full/onlyoffice.yml index eb56ae2674..3d929c970b 100644 --- a/deployments/examples/ocis_full/onlyoffice.yml +++ b/deployments/examples/ocis_full/onlyoffice.yml @@ -33,7 +33,8 @@ services: COLLABORATION_LOG_LEVEL: ${LOG_LEVEL:-info} COLLABORATION_APP_PROOF_DISABLE: "true" volumes: - - ocis-config:/etc/ocis + # configure the .env file to use own paths instead docker internal volumes + - ${OCIS_CONFIG_DIR:-ocis-config}:/etc/ocis labels: - "traefik.enable=true" - "traefik.http.routers.collaboration-oo.entrypoints=https" From 4aae49314b29e10897ddf1b1822232bbfcb67101 Mon Sep 17 00:00:00 2001 From: mmattel Date: Wed, 14 Aug 2024 16:03:55 +0200 Subject: [PATCH 2/4] remove line --- deployments/examples/ocis_full/collabora.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/deployments/examples/ocis_full/collabora.yml b/deployments/examples/ocis_full/collabora.yml index a05f4530cc..deddff4a89 100644 --- a/deployments/examples/ocis_full/collabora.yml +++ b/deployments/examples/ocis_full/collabora.yml @@ -36,7 +36,6 @@ services: COLLABORATION_CS3API_DATAGATEWAY_INSECURE: "${INSECURE:-true}" COLLABORATION_LOG_LEVEL: ${LOG_LEVEL:-info} volumes: - - ocis-config:/etc/ocis # configure the .env file to use own paths instead docker internal volumes - ${OCIS_CONFIG_DIR:-ocis-config}:/etc/ocis labels: From 099a93c920e78acb98d69d56f2d72c2d9d58e6bc Mon Sep 17 00:00:00 2001 From: mmattel Date: Wed, 14 Aug 2024 16:09:28 +0200 Subject: [PATCH 3/4] text fix --- deployments/examples/ocis_full/ocis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/examples/ocis_full/ocis.yml b/deployments/examples/ocis_full/ocis.yml index 6c257411a8..a251e67308 100644 --- a/deployments/examples/ocis_full/ocis.yml +++ b/deployments/examples/ocis_full/ocis.yml @@ -55,7 +55,7 @@ services: - ./config/ocis/app-registry.yaml:/etc/ocis/app-registry.yaml - ./config/ocis/csp.yaml:/etc/ocis/csp.yaml - ./config/ocis/banned-password-list.txt:/etc/ocis/banned-password-list.txt - # configure the .env file to use own paths instead docker internal volumes + # configure the .env file to use own paths instead of docker internal volumes - ${OCIS_CONFIG_DIR:-ocis-config}:/etc/ocis - ${OCIS_DATA_DIR:-ocis-data}:/var/lib/ocis labels: From fa9849ab67bafc6fa7624d07f28e53146d186472 Mon Sep 17 00:00:00 2001 From: Martin Date: Wed, 14 Aug 2024 16:10:03 +0200 Subject: [PATCH 4/4] Apply suggestions from code review Co-authored-by: Phil Davis --- deployments/examples/ocis_full/collabora.yml | 2 +- deployments/examples/ocis_full/onlyoffice.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deployments/examples/ocis_full/collabora.yml b/deployments/examples/ocis_full/collabora.yml index deddff4a89..1bbdc3e112 100644 --- a/deployments/examples/ocis_full/collabora.yml +++ b/deployments/examples/ocis_full/collabora.yml @@ -36,7 +36,7 @@ services: COLLABORATION_CS3API_DATAGATEWAY_INSECURE: "${INSECURE:-true}" COLLABORATION_LOG_LEVEL: ${LOG_LEVEL:-info} volumes: - # configure the .env file to use own paths instead docker internal volumes + # configure the .env file to use own paths instead of docker internal volumes - ${OCIS_CONFIG_DIR:-ocis-config}:/etc/ocis labels: - "traefik.enable=true" diff --git a/deployments/examples/ocis_full/onlyoffice.yml b/deployments/examples/ocis_full/onlyoffice.yml index 3d929c970b..ebce8c02c4 100644 --- a/deployments/examples/ocis_full/onlyoffice.yml +++ b/deployments/examples/ocis_full/onlyoffice.yml @@ -33,7 +33,7 @@ services: COLLABORATION_LOG_LEVEL: ${LOG_LEVEL:-info} COLLABORATION_APP_PROOF_DISABLE: "true" volumes: - # configure the .env file to use own paths instead docker internal volumes + # configure the .env file to use own paths instead of docker internal volumes - ${OCIS_CONFIG_DIR:-ocis-config}:/etc/ocis labels: - "traefik.enable=true"