[ARVADOS] updated: 2.1.0-2504-g8b70a18b3

[Git user]

Summary of changes:
 tools/arvbox/lib/arvbox/docker/Dockerfile.base                | 11 ++++++-----
 tools/arvbox/lib/arvbox/docker/service/workbench2/run-service | 10 +++++++---
 2 files changed, 13 insertions(+), 8 deletions(-)

       via  8b70a18b37ae6f5d081d469af6bcdc8ec3507e2b (commit)
       via  c50f13e8fca1039403ba1a0adb7aa54737989569 (commit)
      from  1ef0acd580ddf41ed67f34152eadad0e60413008 (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 8b70a18b37ae6f5d081d469af6bcdc8ec3507e2b
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Wed May 18 11:44:34 2022 -0400

    Don't install docker in arvbox now that arvados-server install does it.
    
    refs #15370
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.base b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
index b984aeb7f..8f20850ef 100644
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.base
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
@@ -108,11 +108,12 @@ ADD $workdir/8D81803C0EBFCD88.asc /tmp/
 RUN apt-key add --no-tty /tmp/8D81803C0EBFCD88.asc && \
     rm -f /tmp/8D81803C0EBFCD88.asc
 
-RUN mkdir -p /etc/apt/sources.list.d && \
-    echo deb https://download.docker.com/linux/debian/ buster stable > /etc/apt/sources.list.d/docker.list && \
-    apt-get update && \
-    apt-get -yq --no-install-recommends install docker-ce=5:20.10.6~3-0~debian-buster && \
-    apt-get clean
+# docker is now installed by arvados-server install
+# RUN mkdir -p /etc/apt/sources.list.d && \
+#     echo deb https://download.docker.com/linux/debian/ buster stable > /etc/apt/sources.list.d/docker.list && \
+#     apt-get update && \
+#     apt-get -yq --no-install-recommends install docker-ce=5:20.10.6~3-0~debian-buster && \
+#     apt-get clean
 
 # Set UTF-8 locale
 RUN echo en_US.UTF-8 UTF-8 > /etc/locale.gen && locale-gen

commit c50f13e8fca1039403ba1a0adb7aa54737989569
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Tue May 17 15:47:31 2022 -0400

    arvbox option to override API_HOST to test with other clusters
    
    no issue #
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/tools/arvbox/lib/arvbox/docker/service/workbench2/run-service b/tools/arvbox/lib/arvbox/docker/service/workbench2/run-service
index 2b68cadaf..5268c7e17 100755
--- a/tools/arvbox/lib/arvbox/docker/service/workbench2/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/workbench2/run-service
@@ -22,11 +22,15 @@ if test "$1" = "--only-deps" ; then
     exit
 fi
 
+API_HOST=${localip}:${services[controller-ssl]}
+
+if test -f /usr/src/workbench2/public/API_HOST ; then
+    API_HOST=$(cat /usr/src/workbench2/public/API_HOST)
+fi
+
 cat <<EOF > /usr/src/workbench2/public/config.json
 {
-  "API_HOST": "${localip}:${services[controller-ssl]}",
-  "VOCABULARY_URL": "/vocabulary-example.json",
-  "FILE_VIEWERS_CONFIG_URL": "/file-viewers-example.json"
+  "API_HOST": "$API_HOST"
 }
 EOF
 

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


hooks/post-receive
--