Skip to content

Commit

Permalink
Merge pull request #409 from owncloud/update-deps-2020-07-22
Browse files Browse the repository at this point in the history 
Update deps 2020 07 22
  • Loading branch information
Vincent Petry authored Aug 18, 2020
2 parents aa4c13f + bce5e63 commit 0a8c913
Show file tree
Hide file tree
Showing 17 changed files with 498 additions and 451 deletions.
46 changes: 7 additions & 39 deletions .drone.star
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ config = {
},
'uiTests': {
'phoenixBranch': 'master',
'phoenixCommit': 'ccdca163c7e9e6ecc57e08a298b08b1d1175f1d5',
'phoenixCommit': '06cefd5348ee34b80e066827ce530277ecd91991',
'suites': {
'phoenixWebUI1': [
'webUICreateFilesFolders',
Expand Down Expand Up @@ -222,11 +222,9 @@ def localApiTestsOcStorage(ctx, coreBranch = 'master', coreCommit = ''):
'image': 'owncloudci/php:7.2',
'pull': 'always',
'environment' : {
'TEST_SERVER_URL': 'http://ocis-server:9140',
'TEST_SERVER_URL': 'https://ocis-server:9200',
'OCIS_REVA_DATA_ROOT': '/srv/app/tmp/reva/',
'SKELETON_DIR': '/srv/app/tmp/testing/data/apiSkeleton',
'TEST_EXTERNAL_USER_BACKENDS':'true',
'REVA_LDAP_HOSTNAME':'ldap',
'TEST_OCIS':'true',
'BEHAT_FILTER_TAGS': '~@skipOnOcis-OC-Storage',
'PATH_TO_CORE': '/srv/app/testrunner'
Expand All @@ -241,7 +239,6 @@ def localApiTestsOcStorage(ctx, coreBranch = 'master', coreCommit = ''):
},
],
'services':
ldap() +
redis(),
'volumes': [
{
Expand Down Expand Up @@ -277,13 +274,11 @@ def coreApiTests(ctx, coreBranch = 'master', coreCommit = '', part_number = 1, n
'image': 'owncloudci/php:7.2',
'pull': 'always',
'environment' : {
'TEST_SERVER_URL': 'http://ocis-server:9140',
'TEST_SERVER_URL': 'https://ocis-server:9200',
'OCIS_REVA_DATA_ROOT': '/srv/app/tmp/reva/',
'SKELETON_DIR': '/srv/app/tmp/testing/data/apiSkeleton',
'TEST_EXTERNAL_USER_BACKENDS':'true',
'REVA_LDAP_HOSTNAME':'ldap',
'TEST_OCIS':'true',
'BEHAT_FILTER_TAGS': '~@notToImplementOnOCIS&&~@toImplementOnOCIS&&~@preview-extension-required',
'BEHAT_FILTER_TAGS': '~@notToImplementOnOCIS&&~@toImplementOnOCIS',
'DIVIDE_INTO_NUM_PARTS': number_of_parts,
'RUN_PART': part_number,
'EXPECTED_FAILURES_FILE': '/drone/src/tests/acceptance/expected-failures.txt'
Expand All @@ -299,7 +294,6 @@ def coreApiTests(ctx, coreBranch = 'master', coreCommit = '', part_number = 1, n
},
],
'services':
ldap() +
redis(),
'volumes': [
{
Expand Down Expand Up @@ -349,7 +343,6 @@ def uiTestPipeline(suiteName, phoenixBranch = 'master', phoenixCommit = ''):
'OCIS_REVA_DATA_ROOT': '/srv/app/tmp/reva',
'OCIS_SKELETON_DIR': '/srv/app/testing/data/webUISkeleton',
'PHOENIX_CONFIG': '/drone/src/tests/config/drone/ocis-config.json',
'LDAP_SERVER_URL': 'ldap://ldap',
'TEST_TAGS': 'not @skipOnOCIS and not @skip',
'LOCAL_UPLOAD_DIR': '/uploads',
'NODE_TLS_REJECT_UNAUTHORIZED': 0,
Expand Down Expand Up @@ -377,7 +370,6 @@ def uiTestPipeline(suiteName, phoenixBranch = 'master', phoenixCommit = ''):
},
],
'services':
ldap() +
redis() +
selenium(),
'volumes': [
Expand Down Expand Up @@ -963,31 +955,22 @@ def ocisServer():
'pull': 'always',
'detach': True,
'environment' : {
'REVA_LDAP_HOSTNAME': 'ldap',
'REVA_LDAP_PORT': 636,
'REVA_LDAP_BIND_PASSWORD': 'admin',
'REVA_LDAP_BIND_DN': 'cn=admin,dc=owncloud,dc=com',
'REVA_LDAP_BASE_DN': 'dc=owncloud,dc=com',
'REVA_LDAP_SCHEMA_UID': 'uid',
'REVA_LDAP_SCHEMA_MAIL': 'mail',
'REVA_LDAP_SCHEMA_DISPLAYNAME': 'displayName',
'OCIS_LOG_LEVEL': 'debug',

'REVA_STORAGE_HOME_DATA_TEMP_FOLDER': '/srv/app/tmp/',
'REVA_STORAGE_LOCAL_ROOT': '/srv/app/tmp/reva/root',
'REVA_STORAGE_OWNCLOUD_DATADIR': '/srv/app/tmp/reva/data',
'REVA_STORAGE_OC_DATA_TEMP_FOLDER': '/srv/app/tmp/',
'REVA_STORAGE_OWNCLOUD_REDIS_ADDR': 'redis:6379',
'REVA_OIDC_ISSUER': 'https://ocis-server:9200',
'PROXY_OIDC_ISSUER': 'https://ocis-server:9200',
'REVA_STORAGE_OC_DATA_SERVER_URL': 'http://ocis-server:9164/data',
'REVA_DATAGATEWAY_URL': 'https://ocis-server:9200/data',
'REVA_FRONTEND_URL': 'https://ocis-server:9200',
'PHOENIX_WEB_CONFIG': '/drone/src/tests/config/drone/ocis-config.json',
'KONNECTD_IDENTIFIER_REGISTRATION_CONF': '/drone/src/tests/config/drone/identifier-registration.yml',
'KONNECTD_ISS': 'https://ocis-server:9200',
'KONNECTD_TLS': 'true',
'LDAP_URI': 'ldap://ldap',
'LDAP_BINDDN': 'cn=admin,dc=owncloud,dc=com',
'LDAP_BINDPW': 'admin',
'LDAP_BASEDN': 'dc=owncloud,dc=com'
},
'commands': [
'apk add mailcap', # install /etc/mime.types
Expand Down Expand Up @@ -1023,21 +1006,6 @@ def cloneCoreRepos(coreBranch, coreCommit):
}
]

def ldap():
return [
{
'name': 'ldap',
'image': 'osixia/openldap',
'pull': 'always',
'environment': {
'LDAP_DOMAIN': 'owncloud.com',
'LDAP_ORGANISATION': 'ownCloud',
'LDAP_ADMIN_PASSWORD': 'admin',
'LDAP_TLS_VERIFY_CLIENT': 'never',
},
}
]

def redis():
return [
{
Expand Down
1 change: 1 addition & 0 deletions changelog/unreleased/simplify-tracing.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ to set one tracing config for all services at the same time.

https://github.com/owncloud/product/issues/92
https://github.com/owncloud/ocis/pull/329
https://github.com/owncloud/ocis/pull/409
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ services:
REVA_STORAGE_EOS_NAMESPACE: "/eos/dockertest/reva/users"
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_LAYOUT: "{{substr 0 1 .Username}}"
REVA_STORAGE_EOS_LAYOUT: "{{substr 0 1 .Id.OpaqueId}}"

mgm-master:
container_name: mgm-master
Expand Down
18 changes: 15 additions & 3 deletions docs/eos.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Kill the home storage. By default it uses the `owncloud` storage driver. We need

```
docker-compose exec ocis ./bin/ocis kill reva-storage-home
docker-compose exec -e REVA_STORAGE_EOS_LAYOUT="{{substr 0 1 .Username}}/{{.Username}}" -e REVA_STORAGE_HOME_DRIVER=eoshome ocis ./bin/ocis run reva-storage-home
docker-compose exec -e REVA_STORAGE_EOS_LAYOUT="{{substr 0 1 .Id.OpaqueId}}/{{.Id.OpaqueId}}" -e REVA_STORAGE_HOME_DRIVER=eoshome ocis ./bin/ocis run reva-storage-home
```

### 4. Home data provider
Expand All @@ -59,7 +59,7 @@ Kill the home data provider. By default it uses the `owncloud` storage driver. W

```
docker-compose exec ocis ./bin/ocis kill reva-storage-home-data
docker-compose exec -e REVA_STORAGE_EOS_LAYOUT="{{substr 0 1 .Username}}/{{.Username}}" -e REVA_STORAGE_HOME_DATA_DRIVER=eoshome ocis ./bin/ocis run reva-storage-home-data
docker-compose exec -e REVA_STORAGE_EOS_LAYOUT="{{substr 0 1 .Id.OpaqueId}}/{{.Id.OpaqueId}}" -e REVA_STORAGE_HOME_DATA_DRIVER=eoshome ocis ./bin/ocis run reva-storage-home-data
```

{{< hint info >}}
Expand All @@ -80,7 +80,7 @@ docker-compose exec -e DAV_FILES_NAMESPACE="/eos/" ocis ./bin/ocis run reva-fron
Login with `einstein / relativity`, upload a file to einsteins home and verify the file is there using

```
docker-compose exec ocis eos ls -l /eos/dockertest/reva/users/e/einstein/
docker-compose exec ocis eos ls -l /eos/dockertest/reva/users/4/4c510ada-c86b-4815-8820-42cdf82c3d51/
-rw-r--r-- 1 einstein users 10 Jul 1 15:24 newfile.txt
```

Expand Down Expand Up @@ -172,3 +172,15 @@ EOS Console [root://localhost] |/>

But this is a different adventure. See the links at the top of this page for other sources of information on eos.


## Troubleshooting

Q: When running `docker-compose up -d` ocis exits right away.
A: You can check the error code using `docker-compose ps` and investigate further by running only ocis again using `docker-compose up ocis` (without `-d` so you can see what is going on in the foreground).
One reason might be that the binary was already built but does not match the container env. Try running `make clean` before running `docker-compose up ocis` so it gets built inside the container.

Q: How do I update a service in the ocis container?
A: 1. `docker-compose exec ocis make clean build` to update the binary
2. `docker-compose exec ocis ./bin/ocis kill <service>` to kill the service
3. `docker-compose exec ocis ./bin/ocis run <service>` to start the service. Do not forget to set any env vars, eg.
`docker-compose exec -e REVA_STORAGE_EOS_LAYOUT="{{substr 0 1 .Id.OpaqueId}}/{{.Id.OpaqueId}}" -e REVA_STORAGE_HOME_DRIVER=eoshome ocis ./bin/ocis run reva-storage-home`
44 changes: 23 additions & 21 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,54 +3,56 @@ module github.com/owncloud/ocis
go 1.13

require (
contrib.go.opencensus.io/exporter/jaeger v0.2.0
contrib.go.opencensus.io/exporter/jaeger v0.2.1
contrib.go.opencensus.io/exporter/ocagent v0.7.0
contrib.go.opencensus.io/exporter/zipkin v0.1.1
github.com/UnnoTed/fileb0x v1.1.4
github.com/bmatcuk/doublestar v1.3.1 // indirect
github.com/bmatcuk/doublestar v1.3.2 // indirect
github.com/cespare/reflex v0.3.0 // indirect
github.com/coreos/etcd v3.3.21+incompatible // indirect
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/go-log/log v0.2.0 // indirect
github.com/huandu/xstrings v1.3.2 // indirect
github.com/karrick/godirwalk v1.15.6 // indirect
github.com/hashicorp/go-version v1.2.1 // indirect
github.com/karrick/godirwalk v1.16.1 // indirect
github.com/labstack/echo v3.3.10+incompatible // indirect
github.com/labstack/gommon v0.3.0 // indirect
github.com/mattn/go-colorable v0.1.7 // indirect
github.com/micro/cli/v2 v2.1.2
github.com/micro/go-micro/v2 v2.8.0
github.com/micro/micro/v2 v2.8.0
github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1 // indirect
github.com/openzipkin/zipkin-go v0.2.2
github.com/owncloud/flaex v0.2.0
github.com/owncloud/ocis-accounts v0.1.2-0.20200618163128-aa8ae58dd95e
github.com/owncloud/ocis-glauth v0.4.0
github.com/owncloud/ocis-accounts v0.1.2-0.20200811150802-01ede72397e8
github.com/owncloud/ocis-glauth v0.5.1-0.20200731165959-1081de7c60f1
github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7
github.com/owncloud/ocis-graph-explorer v0.0.0-20200210111049-017eeb40dc0c
github.com/owncloud/ocis-hello v0.1.0-alpha1.0.20200604104641-f5d5d6bafa96
github.com/owncloud/ocis-konnectd v0.3.1
github.com/owncloud/ocis-konnectd v0.3.2
github.com/owncloud/ocis-migration v0.2.0
github.com/owncloud/ocis-ocs v0.0.0-20200318181133-cc66a0531da7
github.com/owncloud/ocis-phoenix v0.9.0
github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200527082518-5641fa4a4c8c
github.com/owncloud/ocis-proxy v0.4.0
github.com/owncloud/ocis-reva v0.10.0
github.com/owncloud/ocis-settings v0.0.0-20200602115916-d10179c1aa59
github.com/owncloud/ocis-thumbnails v0.1.2
github.com/owncloud/ocis-webdav v0.1.0
github.com/owncloud/ocis-ocs v0.2.0
github.com/owncloud/ocis-phoenix v0.11.0
github.com/owncloud/ocis-pkg/v2 v2.3.0
github.com/owncloud/ocis-proxy v0.6.0
github.com/owncloud/ocis-reva v0.12.0
github.com/owncloud/ocis-settings v0.1.0
github.com/owncloud/ocis-store v0.1.1
github.com/owncloud/ocis-thumbnails v0.3.0
github.com/owncloud/ocis-webdav v0.1.1
github.com/refs/pman v0.0.0-20200701173654-f05b8833071a
github.com/restic/calens v0.2.0
github.com/valyala/fasttemplate v1.2.0 // indirect
github.com/valyala/fasttemplate v1.2.1 // indirect
go.opencensus.io v0.22.4
go.uber.org/atomic v1.5.1 // indirect
go.uber.org/multierr v1.4.0 // indirect
golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 // indirect
golang.org/x/net v0.0.0-20200707034311-ab3426394381 // indirect
golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect
golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc // indirect
golang.org/x/sys v0.0.0-20200817085935-3ff754bf58a9 // indirect
golang.org/x/text v0.3.3 // indirect
gopkg.in/yaml.v2 v2.3.0 // indirect
golang.org/x/tools v0.0.0-20200817023811-d00afeaade8f // indirect
)

replace google.golang.org/grpc => google.golang.org/grpc v1.26.0

replace github.com/lucas-clemente/quic-go v0.15.7 => github.com/lucas-clemente/quic-go v0.14.1

replace github.com/gomodule/redigo => github.com/gomodule/redigo v1.8.2
Loading

0 comments on commit 0a8c913

Please sign in to comment.