diff --git a/.drone.star b/.drone.star index fbe76ef3420..3e6d063a700 100644 --- a/.drone.star +++ b/.drone.star @@ -60,7 +60,7 @@ config = { "suites": [ "apiShareManagement", ], - "skip": True, + "skip": False, "earlyFail": True, "cron": "nightly", }, @@ -68,7 +68,7 @@ config = { "suites": [ "apiWebdavOperations", ], - "skip": True, + "skip": False, "earlyFail": True, "cron": "nightly", }, @@ -1405,22 +1405,105 @@ def notify(ctx): }, } -def ocisServer(storage, accounts_hash_difficulty = 4, volumes = []): - environment = { - "OCIS_URL": "https://ocis-server:9200", - "STORAGE_USERS_DRIVER": "%s" % (storage), - "STORAGE_USERS_DRIVER_LOCAL_ROOT": "/srv/app/tmp/ocis/local/root", - "STORAGE_USERS_DRIVER_OWNCLOUD_DATADIR": "/srv/app/tmp/ocis/owncloud/data", - "STORAGE_USERS_DRIVER_OCIS_ROOT": "/srv/app/tmp/ocis/storage/users", - "STORAGE_METADATA_DRIVER_OCIS_ROOT": "/srv/app/tmp/ocis/storage/metadata", - "STORAGE_SHARING_USER_JSON_FILE": "/srv/app/tmp/ocis/shares.json", - "PROXY_ENABLE_BASIC_AUTH": True, - "WEB_UI_CONFIG": "/drone/src/tests/config/drone/ocis-config.json", - "IDP_IDENTIFIER_REGISTRATION_CONF": "/drone/src/tests/config/drone/identifier-registration.yml", - "OCIS_LOG_LEVEL": "error", - "SETTINGS_DATA_PATH": "/srv/app/tmp/ocis/settings", - "OCIS_INSECURE": "true", - } +def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on = [], testing_parallel_deploy = False): + if not testing_parallel_deploy: + user = "0:0" + environment = { + "OCIS_URL": "https://ocis-server:9200", + "STORAGE_HOME_DRIVER": "%s" % (storage), + "STORAGE_USERS_DRIVER": "%s" % (storage), + "STORAGE_USERS_DRIVER_LOCAL_ROOT": "/srv/app/tmp/ocis/local/root", + "STORAGE_USERS_DRIVER_OWNCLOUD_DATADIR": "/srv/app/tmp/ocis/owncloud/data", + "STORAGE_USERS_DRIVER_OCIS_ROOT": "/srv/app/tmp/ocis/storage/users", + "STORAGE_METADATA_DRIVER_OCIS_ROOT": "/srv/app/tmp/ocis/storage/metadata", + "STORAGE_SHARING_USER_JSON_FILE": "/srv/app/tmp/ocis/shares.json", + "PROXY_ENABLE_BASIC_AUTH": True, + "WEB_UI_CONFIG": "/drone/src/tests/config/drone/ocis-config.json", + "IDP_IDENTIFIER_REGISTRATION_CONF": "/drone/src/tests/config/drone/identifier-registration.yml", + "OCIS_LOG_LEVEL": "error", + "SETTINGS_DATA_PATH": "/srv/app/tmp/ocis/settings", + "OCIS_INSECURE": "true", + } + else: + user = "33:33" + environment = { + # Keycloak IDP specific configuration + "PROXY_OIDC_ISSUER": "https://keycloak/auth/realmsowncloud", + "WEB_OIDC_AUTHORITY": "https://keycloak/auth/realms/owncloud", + "WEB_OIDC_CLIENT_ID": "ocis-web", + "WEB_OIDC_METADATA_URL": "https://keycloak/auth/realms/owncloud/.well-known/openid-configuration", + "STORAGE_OIDC_ISSUER": "https://keycloak", + "STORAGE_LDAP_IDP": "https://keycloak/auth/realms/owncloud", + "WEB_OIDC_SCOPE": "openid profile email owncloud", + # LDAP bind + "STORAGE_LDAP_HOSTNAME": "openldap", + "STORAGE_LDAP_PORT": 636, + "STORAGE_LDAP_INSECURE": "true", + "STORAGE_LDAP_BIND_DN": "cn=admin,dc=owncloud,dc=com", + "STORAGE_LDAP_BIND_PASSWORD": "admin", + # LDAP user settings + "PROXY_AUTOPROVISION_ACCOUNTS": "true", # automatically create users when they login + "PROXY_ACCOUNT_BACKEND_TYPE": "cs3", # proxy should get users from CS3APIS (which gets it from LDAP) + "PROXY_USER_OIDC_CLAIM": "ocis.user.uuid", # claim was added in Keycloak + "PROXY_USER_CS3_CLAIM": "userid", # equals STORAGE_LDAP_USER_SCHEMA_UID + "STORAGE_LDAP_BASE_DN": "dc=owncloud,dc=com", + "STORAGE_LDAP_GROUP_SCHEMA_DISPLAYNAME": "cn", + "STORAGE_LDAP_GROUP_SCHEMA_GID_NUMBER": "gidnumber", + "STORAGE_LDAP_GROUP_SCHEMA_GID": "cn", + "STORAGE_LDAP_GROUP_SCHEMA_MAIL": "mail", + "STORAGE_LDAP_GROUPATTRIBUTEFILTER": "(&(objectclass=posixGroup)(objectclass=owncloud)({{attr}}={{value}}))", + "STORAGE_LDAP_GROUPFILTER": "(&(objectclass=groupOfUniqueNames)(objectclass=owncloud)(ownclouduuid={{.OpaqueId}}*))", + "STORAGE_LDAP_GROUPMEMBERFILTER": "(&(objectclass=posixAccount)(objectclass=owncloud)(ownclouduuid={{.OpaqueId}}*))", + "STORAGE_LDAP_USERGROUPFILTER": "(&(objectclass=posixGroup)(objectclass=owncloud)(ownclouduuid={{.OpaqueId}}*))", + "STORAGE_LDAP_USER_SCHEMA_CN": "cn", + "STORAGE_LDAP_USER_SCHEMA_DISPLAYNAME": "displayname", + "STORAGE_LDAP_USER_SCHEMA_GID_NUMBER": "gidnumber", + "STORAGE_LDAP_USER_SCHEMA_MAIL": "mail", + "STORAGE_LDAP_USER_SCHEMA_UID_NUMBER": "uidnumber", + "STORAGE_LDAP_USER_SCHEMA_UID": "ownclouduuid", + "STORAGE_LDAP_LOGINFILTER": "(&(objectclass=posixAccount)(objectclass=owncloud)(|(uid={{login}})(mail={{login}})))", + "STORAGE_LDAP_USERATTRIBUTEFILTER": "(&(objectclass=posixAccount)(objectclass=owncloud)({{attr}}={{value}}))", + "STORAGE_LDAP_USERFILTER": "(&(objectclass=posixAccount)(objectclass=owncloud)(|(ownclouduuid={{.OpaqueId}})(uid={{.OpaqueId}})))", + "STORAGE_LDAP_USERFINDFILTER": "(&(objectclass=posixAccount)(objectclass=owncloud)(|(cn={{query}}*)(displayname={{query}}*)(mail={{query}}*)))", + # ownCloud storage driver + "STORAGE_HOME_DRIVER": "owncloudsql", + "STORAGE_USERS_DRIVER": "owncloudsql", + "STORAGE_METADATA_DRIVER": "ocis", + "STORAGE_USERS_DRIVER_OWNCLOUDSQL_DATADIR": "/mnt/data/files", + "STORAGE_USERS_DRIVER_OWNCLOUDSQL_UPLOADINFO_DIR": "/tmp", + "STORAGE_USERS_DRIVER_OWNCLOUDSQL_SHARE_FOLDER": "/Shares", + "STORAGE_USERS_DRIVER_OWNCLOUDSQL_LAYOUT": "{{.Username}}", + "STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBUSERNAME": "owncloud", + "STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBPASSWORD": "owncloud", + "STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBHOST": "oc10-db", + "STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBPORT": 3306, + "STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBNAME": "owncloud", + # TODO: redis is not yet supported + "STORAGE_USERS_DRIVER_OWNCLOUDSQL_REDIS_ADDR": "redis:6379", + # ownCloud sharing driver + "STORAGE_SHARING_USER_DRIVER": "oc10-sql", + "STORAGE_SHARING_USER_SQL_USERNAME": "owncloud", + "STORAGE_SHARING_USER_SQL_PASSWORD": "owncloud", + "STORAGE_SHARING_USER_SQL_HOST": "oc10-db", + "STORAGE_SHARING_USER_SQL_PORT": 3306, + "STORAGE_SHARING_USER_SQL_NAME": "owncloud", + # ownCloud storage readonly + # TODO: conflict with OWNCLOUDSQL -> https://github.com/owncloud/ocis/issues/2303 + "OCIS_STORAGE_READ_ONLY": "false", + # General oCIS config + # OCIS_RUN_EXTENSIONS specifies to start all extensions except glauth, idp and accounts. These are replaced by external services + "OCIS_RUN_EXTENSIONS": "settings,storage-metadata,graph,graph-explorer,ocs,store,thumbnails,web,webdav,storage-frontend,storage-gateway,storage-userprovider,storage-groupprovider,storage-authbasic,storage-authbearer,storage-authmachine,storage-users,storage-shares,storage-public-link,storage-appprovider,storage-sharing,proxy", + "OCIS_LOG_LEVEL": "error", + "OCIS_URL": OCIS_URL, + "PROXY_TLS": "true", + "OCIS_BASE_DATA_PATH": "/mnt/data/ocis", + # change default secrets + "OCIS_JWT_SECRET": "Pive-Fumkiu4", + "STORAGE_TRANSFER_SECRET": "replace-me-with-a-transfer-secret", + "OCIS_MACHINE_AUTH_API_KEY": "change-me-please", + "OCIS_INSECURE": "true", + "PROXY_ENABLE_BASIC_AUTH": "true", + } # Pass in "default" accounts_hash_difficulty to not set this environment variable. # That will allow OCIS to use whatever its built-in default is. @@ -1435,11 +1518,12 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = []): "image": OC_CI_ALPINE, "detach": True, "environment": environment, + "user": user, "commands": [ - "apk add mailcap", # install /etc/mime.types "ocis/bin/ocis server", ], "volumes": volumes, + "depends_on": depends_on, }, { "name": "wait-for-ocis-server", @@ -1447,6 +1531,7 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = []): "commands": [ "wait-for -it ocis-server:9200 -t 300", ], + "depends_on": depends_on, }, ] @@ -1879,8 +1964,8 @@ QUAY_IO_KEYCLOAK = "quay.io/keycloak/keycloak:latest" POSTGRES = "postgres:alpine" # configs -OCIS_URL = "https://ocis:9200" -OCIS_DOMAIN = "ocis:9200" +OCIS_URL = "https://ocis-server:9200" +OCIS_DOMAIN = "ocis-server:9200" OC10_URL = "http://oc10:8080" PARALLEL_DEPLOY_CONFIG_PATH = "/drone/src/tests/parallelDeployAcceptance/drone" @@ -1975,13 +2060,20 @@ def parallelDeployAcceptancePipeline(ctx): "os": "linux", "arch": "amd64", }, - "steps": cloneCoreRepos() + + "steps": skipIfUnchanged(ctx, "acceptance-tests") + + restoreBuildArtifactCache(ctx, "ocis-binary-amd64", "ocis/bin/ocis") + + cloneCoreRepos() + copyConfigs() + - waitForServices() + - oC10Server() + + parallelDeploymentOC10Server() + owncloudLog() + fixSharedDataPermissions() + - latestOcisServer() + + ocisServer( + "ocis", + "default", + [stepVolumeOC10OCISData, stepVolumeOCISConfig], + ["fix-shared-data-permissions"], + True, + ) + parallelAcceptance(environment) + failEarly(ctx, early_fail), "services": oc10DbService() + @@ -1995,6 +2087,7 @@ def parallelDeployAcceptancePipeline(ctx): pipeOCISConfigVol, pipelineVolumeOC10Tests, ], + "depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)]), "trigger": {}, } @@ -2039,7 +2132,7 @@ def parallelAcceptance(env): "commands": [ "make test-paralleldeployment-api", ], - "depends_on": ["clone-core-repos", "wait-for-oc10", "wait-for-ocis"], + "depends_on": ["clone-core-repos", "wait-for-oc10", "wait-for-ocis-server"], "volumes": [ stepVolumeOC10Apps, stepVolumeOC10Tests, @@ -2047,102 +2140,7 @@ def parallelAcceptance(env): ], }] -def latestOcisServer(): - environment = { - # Keycloak IDP specific configuration - "PROXY_OIDC_ISSUER": "https://keycloak/auth/realmsowncloud", - "WEB_OIDC_AUTHORITY": "https://keycloak/auth/realms/owncloud", - "WEB_OIDC_CLIENT_ID": "ocis-web", - "WEB_OIDC_METADATA_URL": "https://keycloak/auth/realms/owncloud/.well-known/openid-configuration", - "STORAGE_OIDC_ISSUER": "https://keycloak", - "STORAGE_LDAP_IDP": "https://keycloak/auth/realms/owncloud", - "WEB_OIDC_SCOPE": "openid profile email owncloud", - # LDAP bind - "STORAGE_LDAP_HOSTNAME": "openldap", - "STORAGE_LDAP_PORT": 636, - "STORAGE_LDAP_INSECURE": "true", - "STORAGE_LDAP_BIND_DN": "cn=admin,dc=owncloud,dc=com", - "STORAGE_LDAP_BIND_PASSWORD": "admin", - # LDAP user settings - "PROXY_AUTOPROVISION_ACCOUNTS": "true", # automatically create users when they login - "PROXY_ACCOUNT_BACKEND_TYPE": "cs3", # proxy should get users from CS3APIS (which gets it from LDAP) - "PROXY_USER_OIDC_CLAIM": "ocis.user.uuid", # claim was added in Keycloak - "PROXY_USER_CS3_CLAIM": "userid", # equals STORAGE_LDAP_USER_SCHEMA_UID - "STORAGE_LDAP_BASE_DN": "dc=owncloud,dc=com", - "STORAGE_LDAP_GROUP_SCHEMA_DISPLAYNAME": "cn", - "STORAGE_LDAP_GROUP_SCHEMA_GID_NUMBER": "gidnumber", - "STORAGE_LDAP_GROUP_SCHEMA_GID": "cn", - "STORAGE_LDAP_GROUP_SCHEMA_MAIL": "mail", - "STORAGE_LDAP_GROUPATTRIBUTEFILTER": "(&(objectclass=posixGroup)(objectclass=owncloud)({{attr}}={{value}}))", - "STORAGE_LDAP_GROUPFILTER": "(&(objectclass=groupOfUniqueNames)(objectclass=owncloud)(ownclouduuid={{.OpaqueId}}*))", - "STORAGE_LDAP_GROUPMEMBERFILTER": "(&(objectclass=posixAccount)(objectclass=owncloud)(ownclouduuid={{.OpaqueId}}*))", - "STORAGE_LDAP_USERGROUPFILTER": "(&(objectclass=posixGroup)(objectclass=owncloud)(ownclouduuid={{.OpaqueId}}*))", - "STORAGE_LDAP_USER_SCHEMA_CN": "cn", - "STORAGE_LDAP_USER_SCHEMA_DISPLAYNAME": "displayname", - "STORAGE_LDAP_USER_SCHEMA_GID_NUMBER": "gidnumber", - "STORAGE_LDAP_USER_SCHEMA_MAIL": "mail", - "STORAGE_LDAP_USER_SCHEMA_UID_NUMBER": "uidnumber", - "STORAGE_LDAP_USER_SCHEMA_UID": "ownclouduuid", - "STORAGE_LDAP_LOGINFILTER": "(&(objectclass=posixAccount)(objectclass=owncloud)(|(uid={{login}})(mail={{login}})))", - "STORAGE_LDAP_USERATTRIBUTEFILTER": "(&(objectclass=posixAccount)(objectclass=owncloud)({{attr}}={{value}}))", - "STORAGE_LDAP_USERFILTER": "(&(objectclass=posixAccount)(objectclass=owncloud)(|(ownclouduuid={{.OpaqueId}})(uid={{.OpaqueId}})))", - "STORAGE_LDAP_USERFINDFILTER": "(&(objectclass=posixAccount)(objectclass=owncloud)(|(cn={{query}}*)(displayname={{query}}*)(mail={{query}}*)))", - # ownCloud storage driver - "STORAGE_USERS_DRIVER": "owncloudsql", - "STORAGE_METADATA_DRIVER": "ocis", - "STORAGE_USERS_DRIVER_OWNCLOUDSQL_DATADIR": "/mnt/data/files", - "STORAGE_USERS_DRIVER_OWNCLOUDSQL_UPLOADINFO_DIR": "/tmp", - "STORAGE_USERS_DRIVER_OWNCLOUDSQL_SHARE_FOLDER": "/Shares", - "STORAGE_USERS_DRIVER_OWNCLOUDSQL_LAYOUT": "{{.Username}}", - "STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBUSERNAME": "owncloud", - "STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBPASSWORD": "owncloud", - "STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBHOST": "oc10-db", - "STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBPORT": 3306, - "STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBNAME": "owncloud", - # TODO: redis is not yet supported - "STORAGE_USERS_DRIVER_OWNCLOUDSQL_REDIS_ADDR": "redis:6379", - # ownCloud storage readonly - # TODO: conflict with OWNCLOUDSQL -> https://github.com/owncloud/ocis/issues/2303 - "OCIS_STORAGE_READ_ONLY": "false", - # General oCIS config - "OCIS_LOG_LEVEL": "error", - "OCIS_URL": OCIS_URL, - "PROXY_TLS": "true", - # change default secrets - "OCIS_JWT_SECRET": "Pive-Fumkiu4", - "STORAGE_TRANSFER_SECRET": "replace-me-with-a-transfer-secret", - "OCIS_MACHINE_AUTH_API_KEY": "change-me-please", - "OCIS_INSECURE": "true", - "PROXY_ENABLE_BASIC_AUTH": "true", - } - - return [ - { - "name": "ocis", - "image": OC_OCIS, - "environment": environment, - "detach": True, - "commands": [ - "ocis server", - ], - "volumes": [ - stepVolumeOC10OCISData, - stepVolumeOCISConfig, - ], - "user": "33:33", - "depends_on": ["fix-permissions"], - }, - { - "name": "wait-for-ocis", - "image": OC_CI_WAIT_FOR, - "commands": [ - "wait-for -it ocis:9200 -t 300", - ], - "depends_on": ["wait-for-oc10"], - }, - ] - -def oC10Server(): +def parallelDeploymentOC10Server(): return [ { "name": "oc10", @@ -2200,7 +2198,7 @@ def oC10Server(): stepVolumeOC10Templates, stepVolumeOC10PreServer, ], - "depends_on": ["wait-for-services", "copy-configs"], + "depends_on": ["copy-configs"], }, { "name": "wait-for-oc10", @@ -2208,7 +2206,7 @@ def oC10Server(): "commands": [ "wait-for -it oc10:8080 -t 300", ], - "depends_on": ["wait-for-services"], + "depends_on": ["oc10"], }, ] @@ -2293,13 +2291,14 @@ def owncloudLog(): def fixSharedDataPermissions(): return [{ - "name": "fix-permissions", + "name": "fix-shared-data-permissions", "image": OC_CI_PHP, "pull": "always", "commands": [ - "chown -R www-data:www-data /var/www/owncloud/apps", - "chmod -R 777 /var/www/owncloud/apps", - "chmod -R 777 /mnt/data/", + "chown -R 33:33 /var/www/owncloud", # www-data user + "chmod -R 777 /var/www/owncloud", + "chown -R 33:33 /mnt/data", # www-data user + "chmod -R 777 /mnt/data", ], "volumes": [ stepVolumeOC10Apps, @@ -2307,13 +2306,3 @@ def fixSharedDataPermissions(): ], "depends_on": ["wait-for-oc10"], }] - -def waitForServices(): - return [{ - "name": "wait-for-services", - "image": OC_CI_WAIT_FOR, - "commands": [ - "wait-for -it oc10-db:3306 -t 300", - "wait-for -it openldap:636 -t 300", - ], - }] diff --git a/.vscode/launch.json b/.vscode/launch.json index 1df7882e22a..94312a3e149 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -19,6 +19,8 @@ "PROXY_ENABLE_BASIC_AUTH": "true", // set insecure options because we don't have valid certificates in dev environments "OCIS_INSECURE": "true", + // OCIS_RUN_EXTENSIONS allows to start a subset of extensions even in the supervised mode + //"OCIS_RUN_EXTENSIONS": "settings,storage-metadata,glauth,graph,graph-explorer,idp,ocs,store,thumbnails,web,webdav,storage-frontend,storage-gateway,storage-userprovider,storage-groupprovider,storage-authbasic,storage-authbearer,storage-authmachine,storage-users,storage-shares,storage-public-link,storage-appprovider,storage-sharing,accounts,proxy", } } ] diff --git a/deployments/examples/oc10_ocis_parallel/config/ocis/entrypoint-override.sh b/deployments/examples/oc10_ocis_parallel/config/ocis/entrypoint-override.sh deleted file mode 100755 index cd72bb548d9..00000000000 --- a/deployments/examples/oc10_ocis_parallel/config/ocis/entrypoint-override.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e -ocis server & -sleep 10 - -# idp, glauth and accounts are not needed -> replaced by Keycloak and OpenLDAP -ocis kill idp -ocis kill glauth -ocis kill accounts - -wait diff --git a/deployments/examples/oc10_ocis_parallel/docker-compose.yml b/deployments/examples/oc10_ocis_parallel/docker-compose.yml index 3d7622e0492..bec46cb653b 100644 --- a/deployments/examples/oc10_ocis_parallel/docker-compose.yml +++ b/deployments/examples/oc10_ocis_parallel/docker-compose.yml @@ -45,9 +45,6 @@ services: ocis: image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest} - entrypoint: - - /bin/sh - - /entrypoint-override.sh networks: ocis-net: user: "33:33" # equals the user "www-data" for oC10 @@ -103,9 +100,19 @@ services: STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBPORT: 3306 STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBNAME: owncloud STORAGE_USERS_DRIVER_OWNCLOUDSQL_REDIS_ADDR: redis:6379 # TODO: redis is not yet supported + # ownCloud sharing driver + STORAGE_SHARING_USER_DRIVER: oc10-sql + STORAGE_SHARING_USER_SQL_USERNAME: owncloud + STORAGE_SHARING_USER_SQL_PASSWORD: owncloud + STORAGE_SHARING_USER_SQL_HOST: oc10-db + STORAGE_SHARING_USER_SQL_PORT: 3306 + STORAGE_SHARING_USER_SQL_NAME: owncloud + # ownCloud storage readonly OCIS_STORAGE_READ_ONLY: "false" # TODO: conflict with OWNCLOUDSQL -> https://github.com/owncloud/ocis/issues/2303 # General oCIS config + # OCIS_RUN_EXTENSIONS specifies to start all extensions except glauth, idp and accounts. These are replaced by external services + OCIS_RUN_EXTENSIONS: settings,storage-metadata,graph,graph-explorer,ocs,store,thumbnails,web,webdav,storage-frontend,storage-gateway,storage-userprovider,storage-groupprovider,storage-authbasic,storage-authbearer,storage-authmachine,storage-users,storage-shares,storage-public-link,storage-appprovider,storage-sharing,proxy OCIS_LOG_LEVEL: ${OCIS_LOG_LEVEL:-error} # make oCIS less verbose OCIS_URL: https://${CLOUD_DOMAIN:-cloud.owncloud.test} PROXY_TLS: "false" # do not use SSL between Traefik and oCIS @@ -117,7 +124,6 @@ services: # INSECURE: needed if oCIS / Traefik is using self generated certificates OCIS_INSECURE: "${INSECURE:-false}" volumes: - - ./config/ocis/entrypoint-override.sh:/entrypoint-override.sh - ./config/ocis/proxy.json:/etc/ocis/proxy.json - ocis-data:/var/lib/ocis # shared volume with oC10 diff --git a/go.mod b/go.mod index 50fd560f30d..6797890fb9b 100644 --- a/go.mod +++ b/go.mod @@ -19,8 +19,8 @@ require ( github.com/asim/go-micro/plugins/wrapper/trace/opencensus/v4 v4.0.0-20211220083148-8e52761edb49 github.com/blevesearch/bleve/v2 v2.3.0 github.com/coreos/go-oidc/v3 v3.1.0 - github.com/cs3org/go-cs3apis v0.0.0-20211214102128-4e8745ab1654 - github.com/cs3org/reva v1.16.1-0.20220127144606-c68537205646 + github.com/cs3org/go-cs3apis v0.0.0-20220126114148-64c025ccdd19 + github.com/cs3org/reva v1.16.1-0.20220128145007-1011a7b43e7e github.com/disintegration/imaging v1.6.2 github.com/glauth/glauth/v2 v2.0.0-20211021011345-ef3151c28733 github.com/go-chi/chi/v5 v5.0.7 @@ -247,5 +247,3 @@ require ( stash.kopano.io/kgol/kcc-go/v5 v5.0.1 // indirect stash.kopano.io/kgol/oidc-go v0.3.2 // indirect ) - -//replace github.com/cs3org/reva => ../reva diff --git a/go.sum b/go.sum index d20c4c4bb7a..3dc4f48deb0 100644 --- a/go.sum +++ b/go.sum @@ -325,10 +325,10 @@ github.com/crewjam/httperr v0.2.0/go.mod h1:Jlz+Sg/XqBQhyMjdDiC+GNNRzZTD7x39Gu3p github.com/crewjam/saml v0.4.5 h1:H9u+6CZAESUKHxMyxUbVn0IawYvKZn4nt3d4ccV4O/M= github.com/crewjam/saml v0.4.5/go.mod h1:qCJQpUtZte9R1ZjUBcW8qtCNlinbO363ooNl02S68bk= github.com/cs3org/cato v0.0.0-20200828125504-e418fc54dd5e/go.mod h1:XJEZ3/EQuI3BXTp/6DUzFr850vlxq11I6satRtz0YQ4= -github.com/cs3org/go-cs3apis v0.0.0-20211214102128-4e8745ab1654 h1:ha5tiuuFyDrwKUrVEc3TrRDFgTKVQ9NGDRmEP0PRPno= -github.com/cs3org/go-cs3apis v0.0.0-20211214102128-4e8745ab1654/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= -github.com/cs3org/reva v1.16.1-0.20220127144606-c68537205646 h1:B0WGEJWGX4IkIwtUKjcx5LCcdRkcXIVj1eB1nEZQs4g= -github.com/cs3org/reva v1.16.1-0.20220127144606-c68537205646/go.mod h1:I5+dJXt8MoLRuV9iDUr7QlUDJ8mIaDkAE10W8mIDKlI= +github.com/cs3org/go-cs3apis v0.0.0-20220126114148-64c025ccdd19 h1:1jqPH58jCxvbaJ9WLIJ7W2/m622bWS6ChptzljSG6IQ= +github.com/cs3org/go-cs3apis v0.0.0-20220126114148-64c025ccdd19/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= +github.com/cs3org/reva v1.16.1-0.20220128145007-1011a7b43e7e h1:LJu/7L7+glzCSSm+1ipdm2HtcZpq3U+f4EMFrdZybOA= +github.com/cs3org/reva v1.16.1-0.20220128145007-1011a7b43e7e/go.mod h1:EAKoGXYmyIKmUSq/fgmAsTGHgrgwSb1PffGiA/AmgSo= github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8 h1:Z9lwXumT5ACSmJ7WGnFl+OMLLjpz5uR2fyz7dC255FI= github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8/go.mod h1:4abs/jPXcmJzYoYGF91JF9Uq9s/KL5n1jvFDix8KcqY= github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=