From f681f91abd89c066f73931c702053054af1ff4fe Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Fri, 28 Jan 2022 09:41:31 +0100 Subject: [PATCH 01/13] start only needed services and set up sharing driver --- .vscode/launch.json | 2 ++ .../config/ocis/entrypoint-override.sh | 11 ----------- .../examples/oc10_ocis_parallel/docker-compose.yml | 14 ++++++++++---- 3 files changed, 12 insertions(+), 15 deletions(-) delete mode 100755 deployments/examples/oc10_ocis_parallel/config/ocis/entrypoint-override.sh 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 From 0de87a940f227fe122f16100cc53316391f981cc Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Fri, 28 Jan 2022 09:53:00 +0100 Subject: [PATCH 02/13] use developement branch --- go.mod | 6 ++---- go.sum | 20 ++++++-------------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index 55a4fdbc991..11e7770ee25 100644 --- a/go.mod +++ b/go.mod @@ -108,7 +108,6 @@ require ( github.com/bluele/gcache v0.0.2 // indirect github.com/bmizerany/pat v0.0.0-20210406213842-e4b6760bdd6f // indirect github.com/boombuler/barcode v1.0.1 // indirect - github.com/ceph/go-ceph v0.13.0 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/coreos/go-oidc v2.2.1+incompatible // indirect github.com/coreos/go-semver v0.3.0 // indirect @@ -120,7 +119,6 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/deckarep/golang-set v1.8.0 // indirect github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect - github.com/dgraph-io/ristretto v0.1.0 // indirect github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect github.com/dustin/go-humanize v1.0.0 // indirect github.com/emirpasic/gods v1.12.0 // indirect @@ -140,7 +138,6 @@ require ( github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt v3.2.2+incompatible // indirect - github.com/golang/glog v1.0.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/snappy v0.0.4 // indirect github.com/gomodule/redigo v1.8.8 // indirect @@ -170,7 +167,6 @@ require ( github.com/mattn/go-runewidth v0.0.13 // indirect github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect - github.com/maxymania/go-system v0.0.0-20170110133659-647cc364bf0b // indirect github.com/mendsley/gojwk v0.0.0-20141217222730-4d5ec6e58103 // indirect github.com/miekg/dns v1.1.44 // indirect github.com/mileusna/useragent v1.0.2 // indirect @@ -249,3 +245,5 @@ require ( ) //replace github.com/cs3org/reva => ../reva + +replace github.com/cs3org/reva => github.com/aduffeck/reva v1.5.1-0.20220126174136-36e95360c3c6 diff --git a/go.sum b/go.sum index 654702c66c5..1cf861f1dbc 100644 --- a/go.sum +++ b/go.sum @@ -84,6 +84,7 @@ github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod h1:chxPXzS github.com/Azure/go-ntlmssp v0.0.0-20211209120228-48547f28849e h1:ZU22z/2YRFLyf/P4ZwUYSdNCWsMEI0VeyrFoI2rAhJQ= github.com/Azure/go-ntlmssp v0.0.0-20211209120228-48547f28849e/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU= github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= @@ -122,6 +123,8 @@ github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWX github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk= github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4= +github.com/aduffeck/reva v1.5.1-0.20220126174136-36e95360c3c6 h1:EmSPKCHNJckqCFaPo4a63HwtK5tpb27Pv7fVTITxp2g= +github.com/aduffeck/reva v1.5.1-0.20220126174136-36e95360c3c6/go.mod h1:/BofcMJgfqTIHNiCp1uXr9ABcgylp27U2W4fjYUR6Fg= github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= @@ -185,11 +188,11 @@ github.com/asim/go-micro/plugins/wrapper/trace/opencensus/v4 v4.0.0-202112200831 github.com/asim/go-micro/plugins/wrapper/trace/opencensus/v4 v4.0.0-20211220083148-8e52761edb49/go.mod h1:PyS1JrBR0nd5tRwEUuFJFQEevYUkmyjxnSH9039c8+Q= github.com/aws/aws-sdk-go v1.20.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48= -github.com/aws/aws-sdk-go v1.35.24/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k= github.com/aws/aws-sdk-go v1.37.27/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.40.11/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= github.com/aws/aws-sdk-go v1.41.13/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= +github.com/aws/aws-sdk-go v1.42.27/go.mod h1:OGr6lGMAKGlG9CVrYnWYDKIyb829c6EVBRjxqjmPepc= github.com/aws/aws-sdk-go v1.42.39 h1:6Lso73VoCI8Zmv3zAMv4BNg2gHAKNOlbLv1s/ew90SI= github.com/aws/aws-sdk-go v1.42.39/go.mod h1:OGr6lGMAKGlG9CVrYnWYDKIyb829c6EVBRjxqjmPepc= github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs= @@ -254,8 +257,6 @@ github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInq github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/ceph/go-ceph v0.13.0 h1:69dgIPlNHD2OCz98T0benI4++vcnShGcpQK4RIALjw4= -github.com/ceph/go-ceph v0.13.0/go.mod h1:mafFpf5Vg8Ai8Bd+FAMvKBHLmtdpTXdRP/TNq8XWegY= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -325,10 +326,9 @@ 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-20211214102047-7ce3134d7bf8/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= 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/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= @@ -342,12 +342,8 @@ github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS3 github.com/deepmap/oapi-codegen v1.3.11/go.mod h1:suMvK7+rKlx3+tpa8ByptmvoXbAV70wERKTOGH3hLp0= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f h1:U5y3Y5UE0w7amNe7Z5G/twsBW0KEalRQXZzf8ufSh9I= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFMt8koVQZ6WFms69WAsDWr2XsYL3Hkl7jkoLE= -github.com/dgraph-io/ristretto v0.1.0 h1:Jv3CGQHp9OjuMBSne1485aDpUkTKEcUqF+jm/LuerPI= -github.com/dgraph-io/ristretto v0.1.0/go.mod h1:fux0lOrBhrVCJd3lcTHsIJhq1T2rokOu6v9Vcb3Q9ug= github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA= -github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8= github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c= @@ -602,7 +598,6 @@ github.com/golang-jwt/jwt/v4 v4.2.0 h1:besgBTC8w8HjP6NzQdxwKH9Z5oQMZ24ThTrHp3cZ8 github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ= github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -951,8 +946,6 @@ github.com/mattn/go-tty v0.0.0-20180219170247-931426f7535a/go.mod h1:XPvLUNfbS4f github.com/mattn/go-tty v0.0.3/go.mod h1:ihxohKRERHTVzN+aSVRwACLCeqIoZAWpoICkkvrWyR0= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/maxymania/go-system v0.0.0-20170110133659-647cc364bf0b h1:Q53idHrTuQDDHyXaxZ6pUl0I9uyD6Z6uKFK3ocX6LzI= -github.com/maxymania/go-system v0.0.0-20170110133659-647cc364bf0b/go.mod h1:KirJrATYGbTyUwVR26xIkaipRqRcMRXBf8N5dacvGus= github.com/mendsley/gojwk v0.0.0-20141217222730-4d5ec6e58103 h1:Z/i1e+gTZrmcGeZyWckaLfucYG6KYOXLWo4co8pZYNY= github.com/mendsley/gojwk v0.0.0-20141217222730-4d5ec6e58103/go.mod h1:o9YPB5aGP8ob35Vy6+vyq3P3bWe7NQWzf+JLiXCiMaE= github.com/mennanov/fieldmask-utils v0.5.0 h1:8em4akN0NM3hmmrg8VbvOPfdS4SSBdbFd53m9VtfOg0= @@ -969,6 +962,7 @@ github.com/mileusna/useragent v1.0.2/go.mod h1:3d8TOmwL/5I8pJjyVDteHtgDGcefrFUX4 github.com/minio/md5-simd v1.1.0/go.mod h1:XpBqgZULrMYD3R+M28PcmP0CkI7PEMzB3U77ZrKZ0Gw= github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= +github.com/minio/minio-go/v7 v7.0.20/go.mod h1:ei5JjmxwHaMrgsMrn4U/+Nmg+d8MKS1U2DAn1ou4+Do= github.com/minio/minio-go/v7 v7.0.21 h1:xrc4BQr1Fa4s5RwY0xfMjPZFJ1bcYBCCHYlngBdWV+k= github.com/minio/minio-go/v7 v7.0.21/go.mod h1:ei5JjmxwHaMrgsMrn4U/+Nmg+d8MKS1U2DAn1ou4+Do= github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM= @@ -1072,7 +1066,6 @@ github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/onsi/gomega v1.18.0/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= @@ -1682,7 +1675,6 @@ golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= From 9147c96ce89c818d7ac5108d03514018760fe217 Mon Sep 17 00:00:00 2001 From: saw-jan Date: Wed, 12 Jan 2022 14:23:40 +0545 Subject: [PATCH 03/13] build ocis server for parallel deploy tests --- .drone.star | 164 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 121 insertions(+), 43 deletions(-) diff --git a/.drone.star b/.drone.star index fbe76ef3420..8de24ed03fe 100644 --- a/.drone.star +++ b/.drone.star @@ -156,18 +156,17 @@ def main(ctx): test_pipelines = \ cancelPreviousBuilds() + \ [buildOcisBinaryForTesting(ctx)] + \ - testOcisModules(ctx) + \ testPipelines(ctx) - build_release_pipelines = \ - dockerReleases(ctx) + \ - binaryReleases(ctx) + \ - [releaseSubmodule(ctx)] + # build_release_pipelines = \ + # dockerReleases(ctx) + \ + # binaryReleases(ctx) + \ + # [releaseSubmodule(ctx)] - build_release_helpers = [ - changelog(ctx), - docs(ctx), - ] + # build_release_helpers = [ + # changelog(ctx), + # docs(ctx), + # ] test_pipelines.append( pipelineDependsOn( @@ -176,7 +175,7 @@ def main(ctx): ), ) - pipelines = test_pipelines + build_release_pipelines + build_release_helpers + pipelines = test_pipelines # + build_release_pipelines + build_release_helpers pipelines = \ pipelines + \ @@ -236,21 +235,21 @@ def testPipelines(ctx): if "skip" not in config["localApiTests"] or not config["localApiTests"]["skip"]: pipelines = [ localApiTests(ctx, "ocis", "apiAccountsHashDifficulty", "default"), - localApiTests(ctx, "ocis", "apiSpaces", "default"), - localApiTests(ctx, "ocis", "apiArchiver", "default"), + # localApiTests(ctx, "ocis", "apiSpaces", "default"), + # localApiTests(ctx, "ocis", "apiArchiver", "default"), ] - if "skip" not in config["apiTests"] or not config["apiTests"]["skip"]: - pipelines += apiTests(ctx) + # if "skip" not in config["apiTests"] or not config["apiTests"]["skip"]: + # pipelines += apiTests(ctx) - if "skip" not in config["uiTests"] or not config["uiTests"]["skip"]: - pipelines += uiTests(ctx) + # if "skip" not in config["uiTests"] or not config["uiTests"]["skip"]: + # pipelines += uiTests(ctx) - if "skip" not in config["accountsUITests"] or not config["accountsUITests"]["skip"]: - pipelines.append(accountsUITests(ctx)) + # if "skip" not in config["accountsUITests"] or not config["accountsUITests"]["skip"]: + # pipelines.append(accountsUITests(ctx)) - if "skip" not in config["settingsUITests"] or not config["settingsUITests"]["skip"]: - pipelines.append(settingsUITests(ctx)) + # if "skip" not in config["settingsUITests"] or not config["settingsUITests"]["skip"]: + # pipelines.append(settingsUITests(ctx)) if "skip" not in config["parallelApiTests"] or not config["parallelApiTests"]["skip"]: pipelines += parallelDeployAcceptancePipeline(ctx) @@ -1405,22 +1404,93 @@ 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: + 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: + 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 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", + } # Pass in "default" accounts_hash_difficulty to not set this environment variable. # That will allow OCIS to use whatever its built-in default is. @@ -1439,7 +1509,9 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = []): "apk add mailcap", # install /etc/mime.types "ocis/bin/ocis server", ], + "user": "33:33", "volumes": volumes, + "depends_on": depends_on, }, { "name": "wait-for-ocis-server", @@ -1879,8 +1951,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" @@ -1981,7 +2053,13 @@ def parallelDeployAcceptancePipeline(ctx): oC10Server() + owncloudLog() + fixSharedDataPermissions() + - latestOcisServer() + + ocisServer( + "ocis", + "default", + [stepVolumeOC10OCISData, stepVolumeOCISConfig], + ["fix-shared-data-permissions"], + True, + ) + parallelAcceptance(environment) + failEarly(ctx, early_fail), "services": oc10DbService() + @@ -2118,7 +2196,7 @@ def latestOcisServer(): return [ { - "name": "ocis", + "name": "ocis-server", "image": OC_OCIS, "environment": environment, "detach": True, @@ -2130,13 +2208,13 @@ def latestOcisServer(): stepVolumeOCISConfig, ], "user": "33:33", - "depends_on": ["fix-permissions"], + "depends_on": ["fix-shared-data-permissions"], }, { "name": "wait-for-ocis", "image": OC_CI_WAIT_FOR, "commands": [ - "wait-for -it ocis:9200 -t 300", + "wait-for -it ocis-server:9200 -t 300", ], "depends_on": ["wait-for-oc10"], }, @@ -2293,7 +2371,7 @@ def owncloudLog(): def fixSharedDataPermissions(): return [{ - "name": "fix-permissions", + "name": "fix-shared-data-permissions", "image": OC_CI_PHP, "pull": "always", "commands": [ From 0c6644643e3e3bd02ea291451d29dea0b41f2b76 Mon Sep 17 00:00:00 2001 From: saw-jan Date: Wed, 12 Jan 2022 15:04:51 +0545 Subject: [PATCH 04/13] fix dependencies fix dependencies --- .drone.star | 69 ++++++++++++++++++++++++----------------------------- 1 file changed, 31 insertions(+), 38 deletions(-) diff --git a/.drone.star b/.drone.star index 8de24ed03fe..298687a244e 100644 --- a/.drone.star +++ b/.drone.star @@ -156,17 +156,18 @@ def main(ctx): test_pipelines = \ cancelPreviousBuilds() + \ [buildOcisBinaryForTesting(ctx)] + \ + testOcisModules(ctx) + \ testPipelines(ctx) - # build_release_pipelines = \ - # dockerReleases(ctx) + \ - # binaryReleases(ctx) + \ - # [releaseSubmodule(ctx)] + build_release_pipelines = \ + dockerReleases(ctx) + \ + binaryReleases(ctx) + \ + [releaseSubmodule(ctx)] - # build_release_helpers = [ - # changelog(ctx), - # docs(ctx), - # ] + build_release_helpers = [ + changelog(ctx), + docs(ctx), + ] test_pipelines.append( pipelineDependsOn( @@ -175,7 +176,7 @@ def main(ctx): ), ) - pipelines = test_pipelines # + build_release_pipelines + build_release_helpers + pipelines = test_pipelines + build_release_pipelines + build_release_helpers pipelines = \ pipelines + \ @@ -235,21 +236,21 @@ def testPipelines(ctx): if "skip" not in config["localApiTests"] or not config["localApiTests"]["skip"]: pipelines = [ localApiTests(ctx, "ocis", "apiAccountsHashDifficulty", "default"), - # localApiTests(ctx, "ocis", "apiSpaces", "default"), - # localApiTests(ctx, "ocis", "apiArchiver", "default"), + localApiTests(ctx, "ocis", "apiSpaces", "default"), + localApiTests(ctx, "ocis", "apiArchiver", "default"), ] - # if "skip" not in config["apiTests"] or not config["apiTests"]["skip"]: - # pipelines += apiTests(ctx) + if "skip" not in config["apiTests"] or not config["apiTests"]["skip"]: + pipelines += apiTests(ctx) - # if "skip" not in config["uiTests"] or not config["uiTests"]["skip"]: - # pipelines += uiTests(ctx) + if "skip" not in config["uiTests"] or not config["uiTests"]["skip"]: + pipelines += uiTests(ctx) - # if "skip" not in config["accountsUITests"] or not config["accountsUITests"]["skip"]: - # pipelines.append(accountsUITests(ctx)) + if "skip" not in config["accountsUITests"] or not config["accountsUITests"]["skip"]: + pipelines.append(accountsUITests(ctx)) - # if "skip" not in config["settingsUITests"] or not config["settingsUITests"]["skip"]: - # pipelines.append(settingsUITests(ctx)) + if "skip" not in config["settingsUITests"] or not config["settingsUITests"]["skip"]: + pipelines.append(settingsUITests(ctx)) if "skip" not in config["parallelApiTests"] or not config["parallelApiTests"]["skip"]: pipelines += parallelDeployAcceptancePipeline(ctx) @@ -1509,7 +1510,6 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on = "apk add mailcap", # install /etc/mime.types "ocis/bin/ocis server", ], - "user": "33:33", "volumes": volumes, "depends_on": depends_on, }, @@ -1519,6 +1519,7 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on = "commands": [ "wait-for -it ocis-server:9200 -t 300", ], + "depends_on": depends_on, }, ] @@ -2047,10 +2048,11 @@ 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() + ocisServer( @@ -2073,6 +2075,7 @@ def parallelDeployAcceptancePipeline(ctx): pipeOCISConfigVol, pipelineVolumeOC10Tests, ], + "depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)]), "trigger": {}, } @@ -2117,7 +2120,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, @@ -2125,7 +2128,7 @@ def parallelAcceptance(env): ], }] -def latestOcisServer(): +def parallelDeploymentOcisServer(): environment = { # Keycloak IDP specific configuration "PROXY_OIDC_ISSUER": "https://keycloak/auth/realmsowncloud", @@ -2220,7 +2223,7 @@ def latestOcisServer(): }, ] -def oC10Server(): +def parallelDeploymentOC10Server(): return [ { "name": "oc10", @@ -2278,7 +2281,7 @@ def oC10Server(): stepVolumeOC10Templates, stepVolumeOC10PreServer, ], - "depends_on": ["wait-for-services", "copy-configs"], + "depends_on": ["copy-configs"], }, { "name": "wait-for-oc10", @@ -2286,7 +2289,7 @@ def oC10Server(): "commands": [ "wait-for -it oc10:8080 -t 300", ], - "depends_on": ["wait-for-services"], + "depends_on": ["copy-configs"], }, ] @@ -2385,13 +2388,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", - ], - }] From 65786ead419b048580806a86ea0821c26cc058c4 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Fri, 28 Jan 2022 11:31:46 +0100 Subject: [PATCH 05/13] add sharing driver to ci --- .drone.star | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.drone.star b/.drone.star index 298687a244e..334558910d1 100644 --- a/.drone.star +++ b/.drone.star @@ -1478,10 +1478,19 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on = "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", From d8fcc401fa85b19a05c6d5c488d00aaa6756c165 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Fri, 28 Jan 2022 12:16:29 +0100 Subject: [PATCH 06/13] fix .drone.star format --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 334558910d1..9c121bf3d66 100644 --- a/.drone.star +++ b/.drone.star @@ -1480,7 +1480,7 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on = "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_USERNAME": "owncloud", "STORAGE_SHARING_USER_SQL_PASSWORD": "owncloud", "STORAGE_SHARING_USER_SQL_HOST": "oc10-db", "STORAGE_SHARING_USER_SQL_PORT": 3306, From 3248942c902cfb877d284e70f9cbb853343924e1 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Fri, 28 Jan 2022 12:33:19 +0100 Subject: [PATCH 07/13] don't skip the parallel deployment anymore --- .drone.star | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.star b/.drone.star index 9c121bf3d66..c70e2b3bd49 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", }, From 429f7a3999a9c19bbad4d082240b2ff19f0a60da Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Mon, 31 Jan 2022 09:51:01 +0100 Subject: [PATCH 08/13] use reva@edge --- go.mod | 12 ++++++------ go.sum | 24 ++++++++++++++++-------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index 11e7770ee25..e5a36412d2d 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 @@ -108,6 +108,7 @@ require ( github.com/bluele/gcache v0.0.2 // indirect github.com/bmizerany/pat v0.0.0-20210406213842-e4b6760bdd6f // indirect github.com/boombuler/barcode v1.0.1 // indirect + github.com/ceph/go-ceph v0.13.0 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/coreos/go-oidc v2.2.1+incompatible // indirect github.com/coreos/go-semver v0.3.0 // indirect @@ -119,6 +120,7 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/deckarep/golang-set v1.8.0 // indirect github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect + github.com/dgraph-io/ristretto v0.1.0 // indirect github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect github.com/dustin/go-humanize v1.0.0 // indirect github.com/emirpasic/gods v1.12.0 // indirect @@ -138,6 +140,7 @@ require ( github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt v3.2.2+incompatible // indirect + github.com/golang/glog v1.0.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/snappy v0.0.4 // indirect github.com/gomodule/redigo v1.8.8 // indirect @@ -167,6 +170,7 @@ require ( github.com/mattn/go-runewidth v0.0.13 // indirect github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect + github.com/maxymania/go-system v0.0.0-20170110133659-647cc364bf0b // indirect github.com/mendsley/gojwk v0.0.0-20141217222730-4d5ec6e58103 // indirect github.com/miekg/dns v1.1.44 // indirect github.com/mileusna/useragent v1.0.2 // indirect @@ -243,7 +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 - -replace github.com/cs3org/reva => github.com/aduffeck/reva v1.5.1-0.20220126174136-36e95360c3c6 diff --git a/go.sum b/go.sum index 1cf861f1dbc..1fe80c116ca 100644 --- a/go.sum +++ b/go.sum @@ -84,7 +84,6 @@ github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod h1:chxPXzS github.com/Azure/go-ntlmssp v0.0.0-20211209120228-48547f28849e h1:ZU22z/2YRFLyf/P4ZwUYSdNCWsMEI0VeyrFoI2rAhJQ= github.com/Azure/go-ntlmssp v0.0.0-20211209120228-48547f28849e/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU= github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= @@ -123,8 +122,6 @@ github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWX github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk= github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4= -github.com/aduffeck/reva v1.5.1-0.20220126174136-36e95360c3c6 h1:EmSPKCHNJckqCFaPo4a63HwtK5tpb27Pv7fVTITxp2g= -github.com/aduffeck/reva v1.5.1-0.20220126174136-36e95360c3c6/go.mod h1:/BofcMJgfqTIHNiCp1uXr9ABcgylp27U2W4fjYUR6Fg= github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= @@ -188,11 +185,11 @@ github.com/asim/go-micro/plugins/wrapper/trace/opencensus/v4 v4.0.0-202112200831 github.com/asim/go-micro/plugins/wrapper/trace/opencensus/v4 v4.0.0-20211220083148-8e52761edb49/go.mod h1:PyS1JrBR0nd5tRwEUuFJFQEevYUkmyjxnSH9039c8+Q= github.com/aws/aws-sdk-go v1.20.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48= +github.com/aws/aws-sdk-go v1.35.24/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k= github.com/aws/aws-sdk-go v1.37.27/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.40.11/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= github.com/aws/aws-sdk-go v1.41.13/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= -github.com/aws/aws-sdk-go v1.42.27/go.mod h1:OGr6lGMAKGlG9CVrYnWYDKIyb829c6EVBRjxqjmPepc= github.com/aws/aws-sdk-go v1.42.39 h1:6Lso73VoCI8Zmv3zAMv4BNg2gHAKNOlbLv1s/ew90SI= github.com/aws/aws-sdk-go v1.42.39/go.mod h1:OGr6lGMAKGlG9CVrYnWYDKIyb829c6EVBRjxqjmPepc= github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs= @@ -257,6 +254,8 @@ github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInq github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/ceph/go-ceph v0.13.0 h1:69dgIPlNHD2OCz98T0benI4++vcnShGcpQK4RIALjw4= +github.com/ceph/go-ceph v0.13.0/go.mod h1:mafFpf5Vg8Ai8Bd+FAMvKBHLmtdpTXdRP/TNq8XWegY= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -326,9 +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-20211214102047-7ce3134d7bf8/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= -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/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= @@ -342,8 +342,12 @@ github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS3 github.com/deepmap/oapi-codegen v1.3.11/go.mod h1:suMvK7+rKlx3+tpa8ByptmvoXbAV70wERKTOGH3hLp0= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f h1:U5y3Y5UE0w7amNe7Z5G/twsBW0KEalRQXZzf8ufSh9I= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFMt8koVQZ6WFms69WAsDWr2XsYL3Hkl7jkoLE= +github.com/dgraph-io/ristretto v0.1.0 h1:Jv3CGQHp9OjuMBSne1485aDpUkTKEcUqF+jm/LuerPI= +github.com/dgraph-io/ristretto v0.1.0/go.mod h1:fux0lOrBhrVCJd3lcTHsIJhq1T2rokOu6v9Vcb3Q9ug= github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA= +github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8= github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c= @@ -598,6 +602,7 @@ github.com/golang-jwt/jwt/v4 v4.2.0 h1:besgBTC8w8HjP6NzQdxwKH9Z5oQMZ24ThTrHp3cZ8 github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ= github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -946,6 +951,8 @@ github.com/mattn/go-tty v0.0.0-20180219170247-931426f7535a/go.mod h1:XPvLUNfbS4f github.com/mattn/go-tty v0.0.3/go.mod h1:ihxohKRERHTVzN+aSVRwACLCeqIoZAWpoICkkvrWyR0= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/maxymania/go-system v0.0.0-20170110133659-647cc364bf0b h1:Q53idHrTuQDDHyXaxZ6pUl0I9uyD6Z6uKFK3ocX6LzI= +github.com/maxymania/go-system v0.0.0-20170110133659-647cc364bf0b/go.mod h1:KirJrATYGbTyUwVR26xIkaipRqRcMRXBf8N5dacvGus= github.com/mendsley/gojwk v0.0.0-20141217222730-4d5ec6e58103 h1:Z/i1e+gTZrmcGeZyWckaLfucYG6KYOXLWo4co8pZYNY= github.com/mendsley/gojwk v0.0.0-20141217222730-4d5ec6e58103/go.mod h1:o9YPB5aGP8ob35Vy6+vyq3P3bWe7NQWzf+JLiXCiMaE= github.com/mennanov/fieldmask-utils v0.5.0 h1:8em4akN0NM3hmmrg8VbvOPfdS4SSBdbFd53m9VtfOg0= @@ -962,7 +969,6 @@ github.com/mileusna/useragent v1.0.2/go.mod h1:3d8TOmwL/5I8pJjyVDteHtgDGcefrFUX4 github.com/minio/md5-simd v1.1.0/go.mod h1:XpBqgZULrMYD3R+M28PcmP0CkI7PEMzB3U77ZrKZ0Gw= github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= -github.com/minio/minio-go/v7 v7.0.20/go.mod h1:ei5JjmxwHaMrgsMrn4U/+Nmg+d8MKS1U2DAn1ou4+Do= github.com/minio/minio-go/v7 v7.0.21 h1:xrc4BQr1Fa4s5RwY0xfMjPZFJ1bcYBCCHYlngBdWV+k= github.com/minio/minio-go/v7 v7.0.21/go.mod h1:ei5JjmxwHaMrgsMrn4U/+Nmg+d8MKS1U2DAn1ou4+Do= github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM= @@ -1066,6 +1072,7 @@ github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= +github.com/onsi/gomega v1.18.0/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= @@ -1675,6 +1682,7 @@ golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= From 88830cbccc5f8c403b8b3530aad574be0c3ba580 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Mon, 31 Jan 2022 11:05:22 +0100 Subject: [PATCH 09/13] also chown the data dir --- .drone.star | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.star b/.drone.star index c70e2b3bd49..65d7264f370 100644 --- a/.drone.star +++ b/.drone.star @@ -2389,6 +2389,7 @@ def fixSharedDataPermissions(): "commands": [ "chown -R www-data:www-data /var/www/owncloud/apps", "chmod -R 777 /var/www/owncloud/apps", + "chown -R www-data:www-data /mnt/data", "chmod -R 777 /mnt/data/", ], "volumes": [ From 9599809e81a181f5d9f620b28c3b9c212201f116 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Mon, 31 Jan 2022 11:17:11 +0100 Subject: [PATCH 10/13] chown full owncloud folder --- .drone.star | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.star b/.drone.star index 65d7264f370..a6a7113685e 100644 --- a/.drone.star +++ b/.drone.star @@ -2387,8 +2387,8 @@ def fixSharedDataPermissions(): "image": OC_CI_PHP, "pull": "always", "commands": [ - "chown -R www-data:www-data /var/www/owncloud/apps", - "chmod -R 777 /var/www/owncloud/apps", + "chown -R www-data:www-data /var/www/owncloud", + "chmod -R 777 /var/www/owncloud", "chown -R www-data:www-data /mnt/data", "chmod -R 777 /mnt/data/", ], From cf8b8b944347290b13af35c46ee75c615761ffe7 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Mon, 31 Jan 2022 12:25:31 +0100 Subject: [PATCH 11/13] set user for ocis --- .drone.star | 104 +++------------------------------------------------- 1 file changed, 6 insertions(+), 98 deletions(-) diff --git a/.drone.star b/.drone.star index a6a7113685e..3337d8146f5 100644 --- a/.drone.star +++ b/.drone.star @@ -1407,6 +1407,7 @@ def notify(ctx): 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), @@ -1424,6 +1425,7 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on = "OCIS_INSECURE": "true", } else: + user = "33:33" environment = { # Keycloak IDP specific configuration "PROXY_OIDC_ISSUER": "https://keycloak/auth/realmsowncloud", @@ -1515,6 +1517,7 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on = "image": OC_CI_ALPINE, "detach": True, "environment": environment, + "user": user, "commands": [ "apk add mailcap", # install /etc/mime.types "ocis/bin/ocis server", @@ -2137,101 +2140,6 @@ def parallelAcceptance(env): ], }] -def parallelDeploymentOcisServer(): - 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-server", - "image": OC_OCIS, - "environment": environment, - "detach": True, - "commands": [ - "ocis server", - ], - "volumes": [ - stepVolumeOC10OCISData, - stepVolumeOCISConfig, - ], - "user": "33:33", - "depends_on": ["fix-shared-data-permissions"], - }, - { - "name": "wait-for-ocis", - "image": OC_CI_WAIT_FOR, - "commands": [ - "wait-for -it ocis-server:9200 -t 300", - ], - "depends_on": ["wait-for-oc10"], - }, - ] - def parallelDeploymentOC10Server(): return [ { @@ -2298,7 +2206,7 @@ def parallelDeploymentOC10Server(): "commands": [ "wait-for -it oc10:8080 -t 300", ], - "depends_on": ["copy-configs"], + "depends_on": ["oc10"], }, ] @@ -2387,9 +2295,9 @@ def fixSharedDataPermissions(): "image": OC_CI_PHP, "pull": "always", "commands": [ - "chown -R www-data:www-data /var/www/owncloud", + "chown -R 33:33 /var/www/owncloud", # www-data user "chmod -R 777 /var/www/owncloud", - "chown -R www-data:www-data /mnt/data", + "chown -R 33:33 /mnt/data", # www-data user "chmod -R 777 /mnt/data/", ], "volumes": [ From d34bc9b0796ac3408b85ac983dcf32e78142caed Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Mon, 31 Jan 2022 12:35:17 +0100 Subject: [PATCH 12/13] don't add packages on runtime... --- .drone.star | 1 - 1 file changed, 1 deletion(-) diff --git a/.drone.star b/.drone.star index 3337d8146f5..c811da88719 100644 --- a/.drone.star +++ b/.drone.star @@ -1519,7 +1519,6 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on = "environment": environment, "user": user, "commands": [ - "apk add mailcap", # install /etc/mime.types "ocis/bin/ocis server", ], "volumes": volumes, From 028aa4314815f5612bddbf057d424bc0c076105e Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Mon, 31 Jan 2022 12:49:47 +0100 Subject: [PATCH 13/13] change ocis base data path --- .drone.star | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index c811da88719..3e6d063a700 100644 --- a/.drone.star +++ b/.drone.star @@ -1496,6 +1496,7 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on = "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", @@ -2297,7 +2298,7 @@ def fixSharedDataPermissions(): "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/", + "chmod -R 777 /mnt/data", ], "volumes": [ stepVolumeOC10Apps,