[ARVADOS] updated: 2.1.0-1239-g2b85e855e

[Git user]

Summary of changes:
 tools/arvbox/lib/arvbox/docker/Dockerfile.base                | 2 +-
 tools/arvbox/lib/arvbox/docker/service/workbench2/run-service | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

       via  2b85e855e6ee7ec246244ffba3da6132852892df (commit)
      from  22fcbed20b2691bcdfa5854004dcb95aa1f2e40d (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 2b85e855e6ee7ec246244ffba3da6132852892df
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Tue Aug 24 13:51:12 2021 -0400

    arvbox ensures workbench2 development server doesn't run with HTTPS
    
    This is because it is already proxied through nginx, which is set up
    with the correct certificates.
    
    Also install 'vim-tiny' to have a way to edit files inside the container.
    
    no issue #
    
    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 79f0d3f4f..c112972c4 100644
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.base
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
@@ -73,7 +73,7 @@ ENV DEBIAN_FRONTEND noninteractive
 #  gnupg2 runit python3-pip python3-setuptools python3-yaml shellinabox netcat less
 RUN apt-get update && \
     apt-get -yq --no-install-recommends -o Acquire::Retries=6 install \
-    gnupg2 runit python3-pip python3-setuptools python3-yaml shellinabox netcat less && \
+    gnupg2 runit python3-pip python3-setuptools python3-yaml shellinabox netcat less vim-tiny && \
     apt-get clean
 
 ENV GOPATH /var/lib/gopath
diff --git a/tools/arvbox/lib/arvbox/docker/service/workbench2/run-service b/tools/arvbox/lib/arvbox/docker/service/workbench2/run-service
index fb3eaaeee..a112cb93f 100755
--- a/tools/arvbox/lib/arvbox/docker/service/workbench2/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/workbench2/run-service
@@ -59,5 +59,6 @@ fi
 export VERSION=$(./version-at-commit.sh)
 export BROWSER=none
 export CI=true
+export HTTPS=false
 node --version
 exec node node_modules/react-scripts/scripts/start.js

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


hooks/post-receive
--