From 3964fc9aa96eeb731ded7ae3cdbbe83edc1056c3 Mon Sep 17 00:00:00 2001 From: Robert Pocklington Date: Fri, 25 Feb 2022 10:56:49 +1100 Subject: [PATCH 1/3] fix: remove need for external ocis-net network --- .../docker-compose.yml | 49 +++++++++---------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/deployments/examples/ocis_individual_services/docker-compose.yml b/deployments/examples/ocis_individual_services/docker-compose.yml index 27ec475432..dda52fb635 100644 --- a/deployments/examples/ocis_individual_services/docker-compose.yml +++ b/deployments/examples/ocis_individual_services/docker-compose.yml @@ -47,7 +47,7 @@ services: deploy: replicas: ${OCIS_SCALE:-1} networks: - ocis-net: null + ocis-net: entrypoint: - ocis - proxy @@ -90,7 +90,7 @@ services: deploy: replicas: 1 networks: - ocis-net: null + ocis-net: entrypoint: - ocis - nats-server @@ -111,7 +111,7 @@ services: deploy: replicas: 1 networks: - ocis-net: null + ocis-net: entrypoint: - /bin/sh - /entrypoint-override.sh @@ -145,7 +145,7 @@ services: deploy: replicas: ${OCIS_SCALE:-1} networks: - ocis-net: null + ocis-net: entrypoint: - ocis - glauth @@ -168,7 +168,7 @@ services: deploy: replicas: 1 networks: - ocis-net: null + ocis-net: entrypoint: - ocis - idp @@ -194,7 +194,7 @@ services: deploy: replicas: ${OCIS_SCALE:-1} networks: - ocis-net: null + ocis-net: entrypoint: - ocis - ocs @@ -222,7 +222,7 @@ services: deploy: replicas: 1 networks: - ocis-net: null + ocis-net: entrypoint: - ocis - settings @@ -247,7 +247,7 @@ services: deploy: replicas: 1 networks: - ocis-net: null + ocis-net: entrypoint: - ocis - store @@ -269,7 +269,7 @@ services: deploy: replicas: ${OCIS_SCALE:-1} networks: - ocis-net: null + ocis-net: entrypoint: - ocis - thumbnails @@ -296,7 +296,7 @@ services: deploy: replicas: ${OCIS_SCALE:-1} networks: - ocis-net: null + ocis-net: entrypoint: - ocis - web @@ -320,7 +320,7 @@ services: deploy: replicas: ${OCIS_SCALE:-1} networks: - ocis-net: null + ocis-net: entrypoint: - ocis - webdav @@ -343,7 +343,7 @@ services: deploy: replicas: ${OCIS_SCALE:-1} networks: - ocis-net: null + ocis-net: entrypoint: - ocis - graph @@ -369,7 +369,7 @@ services: deploy: replicas: 1 networks: - ocis-net: null + ocis-net: entrypoint: - ocis - storage-metadata @@ -402,7 +402,7 @@ services: deploy: replicas: ${OCIS_SCALE:-1} networks: - ocis-net: null + ocis-net: entrypoint: - ocis - storage-auth-basic @@ -426,7 +426,7 @@ services: deploy: replicas: ${OCIS_SCALE:-1} networks: - ocis-net: null + ocis-net: entrypoint: - ocis - storage-auth-machine @@ -450,7 +450,7 @@ services: deploy: replicas: ${OCIS_SCALE:-1} networks: - ocis-net: null + ocis-net: entrypoint: - ocis - storage-auth-bearer @@ -474,7 +474,7 @@ services: deploy: replicas: ${OCIS_SCALE:-1} networks: - ocis-net: null + ocis-net: entrypoint: - ocis - storage-shares @@ -501,7 +501,7 @@ services: deploy: replicas: 1 networks: - ocis-net: null + ocis-net: entrypoint: - ocis - storage-users @@ -535,7 +535,7 @@ services: deploy: replicas: ${OCIS_SCALE:-1} networks: - ocis-net: null + ocis-net: entrypoint: - ocis - storage-public-link @@ -559,7 +559,7 @@ services: deploy: replicas: 1 networks: - ocis-net: null + ocis-net: entrypoint: - ocis - storage-sharing @@ -592,7 +592,7 @@ services: deploy: replicas: ${OCIS_SCALE:-1} networks: - ocis-net: null + ocis-net: entrypoint: - ocis - storage-userprovider @@ -623,7 +623,7 @@ services: deploy: replicas: ${OCIS_SCALE:-1} networks: - ocis-net: null + ocis-net: entrypoint: - ocis - storage-groupprovider @@ -654,7 +654,7 @@ services: deploy: replicas: ${OCIS_SCALE:-1} networks: - ocis-net: null + ocis-net: entrypoint: - ocis - storage-frontend @@ -684,7 +684,7 @@ services: deploy: replicas: ${OCIS_SCALE:-1} networks: - ocis-net: null + ocis-net: entrypoint: - ocis - storage-gateway @@ -731,4 +731,3 @@ volumes: networks: ocis-net: - external: true From 6b3775af9cfe889575ff243891f8bac71d6218b0 Mon Sep 17 00:00:00 2001 From: Robert Pocklington Date: Mon, 28 Feb 2022 09:54:51 +1100 Subject: [PATCH 2/3] Added changelog item --- changelog/unreleased/fix-network-on-individual-services.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelog/unreleased/fix-network-on-individual-services.md diff --git a/changelog/unreleased/fix-network-on-individual-services.md b/changelog/unreleased/fix-network-on-individual-services.md new file mode 100644 index 0000000000..f23a93ab9b --- /dev/null +++ b/changelog/unreleased/fix-network-on-individual-services.md @@ -0,0 +1,5 @@ +Bugfix: Network configuration in individiual_services example. + +Tidy up the deployments/examples/ocis_individual_services example so that the instructions work. + +https://github.com/owncloud/ocis/pull/3238 From 0d362aec3f42b2297cc488fa6c7f00a1f8e84795 Mon Sep 17 00:00:00 2001 From: Willy Kloucek <34452982+wkloucek@users.noreply.github.com> Date: Mon, 14 Mar 2022 08:32:31 +0100 Subject: [PATCH 3/3] Update changelog/unreleased/fix-network-on-individual-services.md Co-authored-by: Pascal Wengerter --- changelog/unreleased/fix-network-on-individual-services.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog/unreleased/fix-network-on-individual-services.md b/changelog/unreleased/fix-network-on-individual-services.md index f23a93ab9b..3f7d42b69d 100644 --- a/changelog/unreleased/fix-network-on-individual-services.md +++ b/changelog/unreleased/fix-network-on-individual-services.md @@ -1,4 +1,4 @@ -Bugfix: Network configuration in individiual_services example. +Bugfix: Network configuration in individiual_services example Tidy up the deployments/examples/ocis_individual_services example so that the instructions work.