[ARVADOS] updated: 3f30342290d901408a3b9a640a21e41f011041cd

Git user git at public.curoverse.com
Tue Feb 14 15:03:03 EST 2017


Summary of changes:
 sdk/cwl/test_with_arvbox.sh                 | 2 ++
 tools/arvbox/lib/arvbox/docker/api-setup.sh | 1 +
 2 files changed, 3 insertions(+)

       via  3f30342290d901408a3b9a640a21e41f011041cd (commit)
       via  c90f6525e949c2314ccc9c2cb980bccbc23e2434 (commit)
       via  6e8c06b81867a3d54e89694f1301ab037d3f5d22 (commit)
      from  72b6a2992c69f557f3b6b850914c5ee914cf862b (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 3f30342290d901408a3b9a640a21e41f011041cd
Merge: 72b6a29 c90f652
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Feb 14 15:02:49 2017 -0500

    Merge branch 'arvbox-docker-imgfmt' no issue #


commit c90f6525e949c2314ccc9c2cb980bccbc23e2434
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Feb 14 15:02:26 2017 -0500

    Update test_with_arvbox script.

diff --git a/sdk/cwl/test_with_arvbox.sh b/sdk/cwl/test_with_arvbox.sh
index ee8daa1..b5a3e99 100755
--- a/sdk/cwl/test_with_arvbox.sh
+++ b/sdk/cwl/test_with_arvbox.sh
@@ -61,6 +61,8 @@ if test $config = dev ; then
   pip_install \$(ls -r dist/arvados-cwl-runner-*.tar.gz | head -n1)
 fi
 
+pip install cwltest
+
 mkdir -p /tmp/cwltest
 cd /tmp/cwltest
 if ! test -d common-workflow-language ; then

commit 6e8c06b81867a3d54e89694f1301ab037d3f5d22
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Feb 14 14:11:20 2017 -0500

    Set docker_image_formats to v1.

diff --git a/tools/arvbox/lib/arvbox/docker/api-setup.sh b/tools/arvbox/lib/arvbox/docker/api-setup.sh
index c5eaf18..1e3462c 100755
--- a/tools/arvbox/lib/arvbox/docker/api-setup.sh
+++ b/tools/arvbox/lib/arvbox/docker/api-setup.sh
@@ -56,6 +56,7 @@ development:
   auto_setup_new_users_with_vm_uuid: $vm_uuid
   auto_setup_new_users_with_repository: true
   default_collection_replication: 1
+  docker_image_formats: ["v1"]
 EOF
 
 (cd config && /usr/local/lib/arvbox/application_yml_override.py)

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list