Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove need for external ocis-net network #3238

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions changelog/unreleased/fix-network-on-individual-services.md
Original file line number Diff line number Diff line change
@@ -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
49 changes: 24 additions & 25 deletions deployments/examples/ocis_individual_services/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ services:
deploy:
replicas: ${OCIS_SCALE:-1}
networks:
ocis-net: null
ocis-net:
entrypoint:
- ocis
- proxy
Expand Down Expand Up @@ -90,7 +90,7 @@ services:
deploy:
replicas: 1
networks:
ocis-net: null
ocis-net:
entrypoint:
- ocis
- nats-server
Expand All @@ -111,7 +111,7 @@ services:
deploy:
replicas: 1
networks:
ocis-net: null
ocis-net:
entrypoint:
- /bin/sh
- /entrypoint-override.sh
Expand Down Expand Up @@ -145,7 +145,7 @@ services:
deploy:
replicas: ${OCIS_SCALE:-1}
networks:
ocis-net: null
ocis-net:
entrypoint:
- ocis
- glauth
Expand All @@ -168,7 +168,7 @@ services:
deploy:
replicas: 1
networks:
ocis-net: null
ocis-net:
entrypoint:
- ocis
- idp
Expand All @@ -194,7 +194,7 @@ services:
deploy:
replicas: ${OCIS_SCALE:-1}
networks:
ocis-net: null
ocis-net:
entrypoint:
- ocis
- ocs
Expand Down Expand Up @@ -222,7 +222,7 @@ services:
deploy:
replicas: 1
networks:
ocis-net: null
ocis-net:
entrypoint:
- ocis
- settings
Expand All @@ -247,7 +247,7 @@ services:
deploy:
replicas: 1
networks:
ocis-net: null
ocis-net:
entrypoint:
- ocis
- store
Expand All @@ -269,7 +269,7 @@ services:
deploy:
replicas: ${OCIS_SCALE:-1}
networks:
ocis-net: null
ocis-net:
entrypoint:
- ocis
- thumbnails
Expand All @@ -296,7 +296,7 @@ services:
deploy:
replicas: ${OCIS_SCALE:-1}
networks:
ocis-net: null
ocis-net:
entrypoint:
- ocis
- web
Expand All @@ -320,7 +320,7 @@ services:
deploy:
replicas: ${OCIS_SCALE:-1}
networks:
ocis-net: null
ocis-net:
entrypoint:
- ocis
- webdav
Expand All @@ -343,7 +343,7 @@ services:
deploy:
replicas: ${OCIS_SCALE:-1}
networks:
ocis-net: null
ocis-net:
entrypoint:
- ocis
- graph
Expand All @@ -369,7 +369,7 @@ services:
deploy:
replicas: 1
networks:
ocis-net: null
ocis-net:
entrypoint:
- ocis
- storage-metadata
Expand Down Expand Up @@ -402,7 +402,7 @@ services:
deploy:
replicas: ${OCIS_SCALE:-1}
networks:
ocis-net: null
ocis-net:
entrypoint:
- ocis
- storage-auth-basic
Expand All @@ -426,7 +426,7 @@ services:
deploy:
replicas: ${OCIS_SCALE:-1}
networks:
ocis-net: null
ocis-net:
entrypoint:
- ocis
- storage-auth-machine
Expand All @@ -450,7 +450,7 @@ services:
deploy:
replicas: ${OCIS_SCALE:-1}
networks:
ocis-net: null
ocis-net:
entrypoint:
- ocis
- storage-auth-bearer
Expand All @@ -474,7 +474,7 @@ services:
deploy:
replicas: ${OCIS_SCALE:-1}
networks:
ocis-net: null
ocis-net:
entrypoint:
- ocis
- storage-shares
Expand All @@ -501,7 +501,7 @@ services:
deploy:
replicas: 1
networks:
ocis-net: null
ocis-net:
entrypoint:
- ocis
- storage-users
Expand Down Expand Up @@ -535,7 +535,7 @@ services:
deploy:
replicas: ${OCIS_SCALE:-1}
networks:
ocis-net: null
ocis-net:
entrypoint:
- ocis
- storage-public-link
Expand All @@ -559,7 +559,7 @@ services:
deploy:
replicas: 1
networks:
ocis-net: null
ocis-net:
entrypoint:
- ocis
- storage-sharing
Expand Down Expand Up @@ -592,7 +592,7 @@ services:
deploy:
replicas: ${OCIS_SCALE:-1}
networks:
ocis-net: null
ocis-net:
entrypoint:
- ocis
- storage-userprovider
Expand Down Expand Up @@ -623,7 +623,7 @@ services:
deploy:
replicas: ${OCIS_SCALE:-1}
networks:
ocis-net: null
ocis-net:
entrypoint:
- ocis
- storage-groupprovider
Expand Down Expand Up @@ -654,7 +654,7 @@ services:
deploy:
replicas: ${OCIS_SCALE:-1}
networks:
ocis-net: null
ocis-net:
entrypoint:
- ocis
- storage-frontend
Expand Down Expand Up @@ -684,7 +684,7 @@ services:
deploy:
replicas: ${OCIS_SCALE:-1}
networks:
ocis-net: null
ocis-net:
entrypoint:
- ocis
- storage-gateway
Expand Down Expand Up @@ -731,4 +731,3 @@ volumes:

networks:
ocis-net:
external: true