From a037ef4edb0b3284d6269fbaf0a874c8728449ea Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Thu, 10 Dec 2020 13:32:57 +0100 Subject: [PATCH] use default paths --- deployments/examples/ocis_keycloak/README.md | 2 +- .../examples/ocis_keycloak/docker-compose.yml | 18 +++--------------- deployments/examples/ocis_traefik/README.md | 4 ++-- .../examples/ocis_traefik/docker-compose.yml | 16 ++-------------- .../examples/owncloud10_with_oc_web/README.md | 2 +- .../owncloud10_with_oc_web/docker-compose.yml | 16 ++-------------- 6 files changed, 11 insertions(+), 47 deletions(-) diff --git a/deployments/examples/ocis_keycloak/README.md b/deployments/examples/ocis_keycloak/README.md index 12bc13c6ab7..d84440cd023 100644 --- a/deployments/examples/ocis_keycloak/README.md +++ b/deployments/examples/ocis_keycloak/README.md @@ -1,5 +1,5 @@ --- -document this deployment example in docs/ocis/deployment/ocis_keycloak.md +document this deployment example in: docs/ocis/deployment/ocis_keycloak.md --- Please refer to [our documentation](https://owncloud.github.io/ocis/deployment/ocis_keycloak/) diff --git a/deployments/examples/ocis_keycloak/docker-compose.yml b/deployments/examples/ocis_keycloak/docker-compose.yml index 81c5ec91574..3392b0f230a 100644 --- a/deployments/examples/ocis_keycloak/docker-compose.yml +++ b/deployments/examples/ocis_keycloak/docker-compose.yml @@ -63,17 +63,8 @@ services: STORAGE_DATAGATEWAY_PUBLIC_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}/data STORAGE_FRONTEND_PUBLIC_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}/ STORAGE_OIDC_ISSUER: https://${KEYCLOAK_DOMAIN:-keycloak.owncloud.test} - STORAGE_METADATA_ROOT: /opt/ocis-metadata - STORAGE_DRIVER_OCIS_ROOT: /opt/ocis-storage - # store config - STORE_DATA_PATH: /opt/ocis-store - # settings config - SETTINGS_DATA_PATH: /opt/ocis-settings volumes: - - ocis-storage:/opt/ocis-storage - - ocis-metadata:/opt/ocis-metadata - - ocis-store:/opt/ocis-store - - ocis-settings:/opt/ocis-settings + - ocis-data:/var/tmp/ocis labels: - "traefik.enable=true" - "traefik.http.routers.ocis.entrypoints=http" @@ -129,8 +120,5 @@ services: volumes: certs: - ocis-storage: - ocis-metadata: - ocis-store: - ocis-settings: - keycloak_postgres_data: + ocis-data: + diff --git a/deployments/examples/ocis_traefik/README.md b/deployments/examples/ocis_traefik/README.md index e81bb764516..efaf76843a4 100644 --- a/deployments/examples/ocis_traefik/README.md +++ b/deployments/examples/ocis_traefik/README.md @@ -1,6 +1,6 @@ --- -document this deployment example in docs/ocis/deployment/owncloud10_with_ocis_web.md +document this deployment example in: docs/ocis/deployment/ocis_traefik.md --- -Please refer to [our documentation](https://owncloud.github.io/ocis/deployment/owncloud10_with_ocis_web/) +Please refer to [our documentation](https://owncloud.github.io/ocis/deployment/ocis_traefik/) for instructions on how to deploy this scenario. diff --git a/deployments/examples/ocis_traefik/docker-compose.yml b/deployments/examples/ocis_traefik/docker-compose.yml index 762b4f73b89..a7263f1f997 100644 --- a/deployments/examples/ocis_traefik/docker-compose.yml +++ b/deployments/examples/ocis_traefik/docker-compose.yml @@ -68,21 +68,12 @@ services: STORAGE_DATAGATEWAY_PUBLIC_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}/data STORAGE_FRONTEND_PUBLIC_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}/ STORAGE_OIDC_ISSUER: https://${OCIS_DOMAIN:-ocis.owncloud.test} - STORAGE_METADATA_ROOT: /opt/ocis-metadata - STORAGE_DRIVER_OCIS_ROOT: /opt/ocis-storage - # store config - STORE_DATA_PATH: /opt/ocis-store - # settings config - SETTINGS_DATA_PATH: /opt/ocis-settings # idp config KONNECTD_ISS: https://${OCIS_DOMAIN:-ocis.owncloud.test} KONNECTD_TLS: 'false' volumes: - ./config:/config - - ocis-storage:/opt/ocis-storage - - ocis-metadata:/opt/ocis-metadata - - ocis-store:/opt/ocis-store - - ocis-settings:/opt/ocis-settings + - ocis-data:/var/tmp/ocis labels: - "traefik.enable=true" - "traefik.http.routers.ocis.entrypoints=http" @@ -99,7 +90,4 @@ services: volumes: certs: - ocis-storage: - ocis-metadata: - ocis-store: - ocis-settings: + ocis-data: diff --git a/deployments/examples/owncloud10_with_oc_web/README.md b/deployments/examples/owncloud10_with_oc_web/README.md index dfdba79aa4c..0ca6898eb3f 100644 --- a/deployments/examples/owncloud10_with_oc_web/README.md +++ b/deployments/examples/owncloud10_with_oc_web/README.md @@ -1,5 +1,5 @@ --- -document this deployment example in docs/ocis/deployment/ocis_oc10_backend.md +document this deployment example in: docs/ocis/deployment/owncloud10_with_oc_web.md --- Please refer to [our documentation](https://owncloud.github.io/ocis/deployment/owncloud10_with_oc_web/) diff --git a/deployments/examples/owncloud10_with_oc_web/docker-compose.yml b/deployments/examples/owncloud10_with_oc_web/docker-compose.yml index d13bd5bcdab..2d208bf02a7 100644 --- a/deployments/examples/owncloud10_with_oc_web/docker-compose.yml +++ b/deployments/examples/owncloud10_with_oc_web/docker-compose.yml @@ -105,18 +105,9 @@ services: STORAGE_FRONTEND_PUBLIC_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test} STORAGE_DATAGATEWAY_PUBLIC_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}/data STORAGE_LDAP_IDP: https://${OCIS_DOMAIN:-ocis.owncloud.test} - STORAGE_METADATA_ROOT: /opt/ocis-metadata - STORAGE_DRIVER_OCIS_ROOT: /opt/ocis-storage - # store config - STORE_DATA_PATH: /opt/ocis-store - # settings config - SETTINGS_DATA_PATH: /opt/ocis-settings volumes: - ./config/ocis:/config - - ocis-storage:/opt/ocis-storage - - ocis-metadata:/opt/ocis-metadata - - ocis-store:/opt/ocis-store - - ocis-settings:/opt/ocis-settings + - ocis-data:/var/tmp/ocis labels: - "traefik.enable=true" - "traefik.http.routers.ocis.entrypoints=http" @@ -204,10 +195,7 @@ services: volumes: certs: - ocis-storage: - ocis-metadata: - ocis-store: - ocis-settings: + ocis-data: files: driver: local mysql: