Skip to content
This repository has been archived by the owner on Jan 18, 2021. It is now read-only.

Point frontend to proxy #261

Merged
merged 19 commits into from
Jun 26, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 28 additions & 22 deletions .drone.star
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
def main(ctx):
before = [
testing(ctx),
apiTests(ctx, 'master', '31dbb9ce87de35165edf85ce9eda8f004c73f9f8'),
apiTests(ctx, 'master', 'ad274cb7f2a20ffba7fb9c65726ae9ef9270e4c0'),
]

stages = [
Expand Down Expand Up @@ -65,21 +65,24 @@ def apiTests(ctx, coreBranch = 'master', coreCommit = ''):
'REVA_STORAGE_OC_DATA_SERVER_URL': 'http://reva-server:9164/data',
'REVA_STORAGE_OC_DATA_URL': 'reva-server:9164',
'REVA_STORAGE_OWNCLOUD_REDIS_ADDR': 'redis:6379',
'REVA_SHARING_USER_JSON_FILE': '/srv/app/tmp/reva/shares.json'
'REVA_SHARING_USER_JSON_FILE': '/srv/app/tmp/reva/shares.json',
'REVA_FRONTEND_URL': 'http://reva-server:9140',
'REVA_DATAGATEWAY_URL': 'http://reva-server:9140/data',
},
'commands': [
'apk add mailcap',
'mkdir -p /srv/app/tmp/reva',
'bin/ocis-reva gateway &',
'bin/ocis-reva users &',
'bin/ocis-reva auth-basic &',
'bin/ocis-reva auth-bearer &',
'bin/ocis-reva sharing &',
'bin/ocis-reva storage-home &',
'bin/ocis-reva storage-home-data &',
'bin/ocis-reva storage-oc &',
'bin/ocis-reva storage-oc-data &',
'bin/ocis-reva frontend'
'bin/ocis-reva --log-level debug --log-pretty gateway &',
'bin/ocis-reva --log-level debug --log-pretty users &',
'bin/ocis-reva --log-level debug --log-pretty auth-basic &',
'bin/ocis-reva --log-level debug --log-pretty auth-bearer &',
'bin/ocis-reva --log-level debug --log-pretty sharing &',
'bin/ocis-reva --log-level debug --log-pretty storage-home &',
'bin/ocis-reva --log-level debug --log-pretty storage-home-data &',
'bin/ocis-reva --log-level debug --log-pretty storage-oc &',
'bin/ocis-reva --log-level debug --log-pretty storage-oc-data &',
'bin/ocis-reva --log-level debug --log-pretty frontend &',
'bin/ocis-reva --log-level debug --log-pretty reva-storage-public-link'
],
'volumes': [
{
Expand Down Expand Up @@ -279,19 +282,22 @@ def testing(ctx):
'REVA_STORAGE_OWNCLOUD_REDIS_ADDR': 'redis:6379',
'REVA_SHARING_USER_JSON_FILE': '/srv/app/tmp/reva/shares.json',
'REVA_OIDC_ISSUER': 'https://konnectd:9130',
'REVA_FRONTEND_URL': 'http://reva-server:9140',
'REVA_DATAGATEWAY_URL': 'http://reva-server:9140/data',
},
'commands': [
'mkdir -p /srv/app/tmp/reva',
'bin/ocis-reva gateway &',
'bin/ocis-reva users &',
'bin/ocis-reva auth-basic &',
'bin/ocis-reva auth-bearer &',
'bin/ocis-reva sharing &',
'bin/ocis-reva storage-home &',
'bin/ocis-reva storage-home-data &',
'bin/ocis-reva storage-oc &',
'bin/ocis-reva storage-oc-data &',
'bin/ocis-reva frontend'
'bin/ocis-reva --log-level debug --log-pretty gateway &',
'bin/ocis-reva --log-level debug --log-pretty users &',
'bin/ocis-reva --log-level debug --log-pretty auth-basic &',
'bin/ocis-reva --log-level debug --log-pretty auth-bearer &',
'bin/ocis-reva --log-level debug --log-pretty sharing &',
'bin/ocis-reva --log-level debug --log-pretty storage-home &',
'bin/ocis-reva --log-level debug --log-pretty storage-home-data &',
'bin/ocis-reva --log-level debug --log-pretty storage-oc &',
'bin/ocis-reva --log-level debug --log-pretty storage-oc-data &',
'bin/ocis-reva --log-level debug --log-pretty frontend &',
'bin/ocis-reva --log-level debug --log-pretty reva-storage-public-link'
],
'volumes': [
{
Expand Down
19 changes: 19 additions & 0 deletions changelog/unreleased/update-reva-to-20200625.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Enhancement: update reva to v0.1.1-0.20200625112940-6a2822cb3f15

- Updated reva to v0.1.1-0.20200625112940-6a2822cb3f15 (#261)
- TUS upload support through datagateway (#261, reva/#878, reva/#888)
- Added support for differing metrics path for Prometheus to Mentix (reva/#875)
- More data exported by Mentix (reva/#881)
- Implementation of file operations in public folder shares (#49, #293, reva/#877)
- Make httpclient trust local certificates for now (reva/#880)

https://github.com/owncloud/ocis-reva/pull/261
https://github.com/cs3org/reva/pull/875
https://github.com/owncloud/ocis-reva/issues/49
https://github.com/owncloud/ocis-reva/issues/293
https://github.com/cs3org/reva/pull/877
https://github.com/owncloud/ocis-reva/issues/261
https://github.com/cs3org/reva/pull/878
https://github.com/cs3org/reva/pull/881
https://github.com/cs3org/reva/pull/880
https://github.com/cs3org/reva/pull/888
Loading