[ARVADOS] updated: 1.3.0-1470-gf0bc73f28

Git user git at public.curoverse.com
Thu Aug 8 00:36:38 UTC 2019


Summary of changes:
 sdk/python/tests/run_test_server.py                         | 3 +++
 tools/arvbox/lib/arvbox/docker/cluster-config.sh            | 8 ++++++++
 tools/arvbox/lib/arvbox/docker/service/keep-web/run-service | 6 +-----
 3 files changed, 12 insertions(+), 5 deletions(-)

       via  f0bc73f28a14af9499dd32e906429d1bc276c969 (commit)
       via  4923d561f16ed4c665e89142f01b7b1d3786ac2c (commit)
      from  acb1d98cdfa6e33bfd3e1bb7510b78a4fd9384e2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit f0bc73f28a14af9499dd32e906429d1bc276c969
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Wed Aug 7 21:36:14 2019 -0300

    14716: wb integration tests (wip)
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py
index 679f04b98..80227e6cd 100644
--- a/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@ -743,6 +743,9 @@ def setup_config():
                 "Services": services,
                 "Users": {
                     "AnonymousUserToken": auth_token('anonymous')
+                },
+                "Collections": {
+                    "TrustAllContent": True
                 }
             }
         }

commit 4923d561f16ed4c665e89142f01b7b1d3786ac2c
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Wed Aug 7 19:17:18 2019 -0300

    14716: Updates arvbox scripts
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/tools/arvbox/lib/arvbox/docker/cluster-config.sh b/tools/arvbox/lib/arvbox/docker/cluster-config.sh
index 801787e6a..eba195630 100755
--- a/tools/arvbox/lib/arvbox/docker/cluster-config.sh
+++ b/tools/arvbox/lib/arvbox/docker/cluster-config.sh
@@ -83,6 +83,12 @@ Clusters:
       GitHTTP:
         ExternalURL: "http://$localip:${services[arv-git-httpd]}/"
       WebDAV:
+        InternalURLs:
+          "http://localhost:${services[keep-web]}/": {}
+        ExternalURL: "https://$localip:${services[keep-web-ssl]}/"
+      WebDAVDownload:
+        InternalURLs:
+          "http://localhost:${services[keep-web]}/": {}
         ExternalURL: "https://$localip:${services[keep-web-ssl]}/"
       Composer:
         ExternalURL: "http://$localip:${services[composer]}"
@@ -109,6 +115,7 @@ Clusters:
     Collections:
       BlobSigningKey: $blob_signing_key
       DefaultReplication: 1
+      TrustAllContent: true
     Login:
       ProviderAppSecret: $sso_app_secret
       ProviderAppID: arvados-server
@@ -118,6 +125,7 @@ Clusters:
       AutoSetupNewUsers: true
       AutoSetupNewUsersWithVmUUID: $vm_uuid
       AutoSetupNewUsersWithRepository: true
+      AnonymousUserToken: $(cat /var/lib/arvados/superuser_token)
     Workbench:
       SecretKeyBase: $workbench_secret_key_base
       ArvadosDocsite: http://$localip:${services[doc]}/
diff --git a/tools/arvbox/lib/arvbox/docker/service/keep-web/run-service b/tools/arvbox/lib/arvbox/docker/service/keep-web/run-service
index b539b6ae1..a38b633a8 100755
--- a/tools/arvbox/lib/arvbox/docker/service/keep-web/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/keep-web/run-service
@@ -16,8 +16,4 @@ if test "$1" = "--only-deps" ; then
     exit
 fi
 
-export ARVADOS_API_HOST=$localip:${services[controller-ssl]}
-export ARVADOS_API_HOST_INSECURE=1
-export ARVADOS_API_TOKEN=$(cat /var/lib/arvados/superuser_token)
-
-exec /usr/local/bin/keep-web -trust-all-content -listen=:${services[keep-web]}
+exec /usr/local/bin/keep-web

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list