From 8d68516eb79ba692c50378bc9352484112999f97 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Mon, 12 Oct 2020 10:59:02 +0545 Subject: [PATCH] rename reva to storage in docker-compose file --- ocis/docker-compose.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ocis/docker-compose.yml b/ocis/docker-compose.yml index 81516f89e..ccdc66e9b 100644 --- a/ocis/docker-compose.yml +++ b/ocis/docker-compose.yml @@ -44,19 +44,19 @@ services: PHOENIX_OIDC_AUTHORITY: https://${OCIS_DOMAIN:-localhost}:9200 PHOENIX_OIDC_METADATA_URL: https://${OCIS_DOMAIN:-localhost}:9200/.well-known/openid-configuration PHOENIX_WEB_CONFIG_SERVER: https://${OCIS_DOMAIN:-localhost}:9200 - REVA_OIDC_ISSUER: https://${OCIS_DOMAIN:-localhost}:9200 - REVA_LDAP_IDP: https://${OCIS_DOMAIN:-localhost}:9200 - # TODO make id the default in ocis-reva - REVA_STORAGE_EOS_LAYOUT: "{{substr 0 1 .Id.OpaqueId}}/{{.Id.OpaqueId}}" - REVA_FRONTEND_URL: https://${OCIS_DOMAIN:-localhost}:9200 - REVA_DATAGATEWAY_URL: https://${OCIS_DOMAIN:-localhost}:9200/data + STORAGE_OIDC_ISSUER: https://${OCIS_DOMAIN:-localhost}:9200 + STORAGE_LDAP_IDP: https://${OCIS_DOMAIN:-localhost}:9200 + # TODO make id the default in ocis-storage + STORAGE_STORAGE_EOS_LAYOUT: "{{substr 0 1 .Id.OpaqueId}}/{{.Id.OpaqueId}}" + STORAGE_FRONTEND_URL: https://${OCIS_DOMAIN:-localhost}:9200 + STORAGE_DATAGATEWAY_URL: https://${OCIS_DOMAIN:-localhost}:9200/data # common eos settings used for both drivers: eos and eoshome - REVA_STORAGE_EOS_MASTER_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094} - REVA_STORAGE_EOS_SLAVE_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094} - REVA_STORAGE_EOS_NAMESPACE: "/eos/dockertest/reva/users" + STORAGE_STORAGE_EOS_MASTER_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094} + STORAGE_STORAGE_EOS_SLAVE_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094} + STORAGE_STORAGE_EOS_NAMESPACE: "/eos/dockertest/reva/users" # the eos end xrdcopy binaries use this env var to find the eos mgm EOS_MGM_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094} - + mgm-master: container_name: mgm-master image: owncloud/eos-mgm:4.6.5