From 84e42cb0ee279b8ade543146ba3967786d098119 Mon Sep 17 00:00:00 2001
From: Peter Amstutz <pamstutz@veritasgenetics.com>
Date: Mon, 4 Feb 2019 13:17:44 -0500
Subject: [PATCH] arvbox support for python3 refs #13306

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>
---
 tools/arvbox/bin/arvbox                        |  7 ++++++-
 tools/arvbox/lib/arvbox/docker/Dockerfile.base |  3 ++-
 tools/arvbox/lib/arvbox/docker/common.sh       | 11 +++++++++--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/tools/arvbox/bin/arvbox b/tools/arvbox/bin/arvbox
index a258b8e232..66aebf80d4 100755
--- a/tools/arvbox/bin/arvbox
+++ b/tools/arvbox/bin/arvbox
@@ -361,7 +361,12 @@ case "$subcmd" in
         ;;
 
     sh*)
-        exec docker exec -ti -e LINES=$(tput lines) -e COLUMNS=$(tput cols) -e TERM=$TERM -e GEM_HOME=/var/lib/gems $ARVBOX_CONTAINER /bin/bash
+        exec docker exec -ti \
+	       -e LINES=$(tput lines) \
+	       -e COLUMNS=$(tput cols) \
+	       -e TERM=$TERM \
+	       -e GEM_HOME=/var/lib/gems \
+	       $ARVBOX_CONTAINER /bin/bash
         ;;
 
     pipe)
diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.base b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
index 1c1ad17814..162edc927f 100644
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.base
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
@@ -19,7 +19,8 @@ RUN apt-get update && \
     apt-transport-https ca-certificates slurm-wlm \
     linkchecker python3-virtualenv python-virtualenv xvfb iceweasel \
     libgnutls28-dev python3-dev vim cadaver cython gnupg dirmngr \
-    libsecret-1-dev r-base r-cran-testthat libxml2-dev pandoc && \
+    libsecret-1-dev r-base r-cran-testthat libxml2-dev pandoc \
+    python3-setuptools python3-pip && \
     apt-get clean
 
 ENV RUBYVERSION_MINOR 2.3
diff --git a/tools/arvbox/lib/arvbox/docker/common.sh b/tools/arvbox/lib/arvbox/docker/common.sh
index 56d0fa0135..bbd11f0341 100644
--- a/tools/arvbox/lib/arvbox/docker/common.sh
+++ b/tools/arvbox/lib/arvbox/docker/common.sh
@@ -66,6 +66,7 @@ run_bundler() {
     fi
 }
 
+PYCMD=""
 pip_install() {
     pushd /var/lib/pip
     for p in $(ls http*.tar.gz) $(ls http*.tar.bz2) $(ls http*.whl) $(ls http*.zip) ; do
@@ -75,7 +76,13 @@ pip_install() {
     done
     popd
 
-    if ! pip install --no-index --find-links /var/lib/pip $1 ; then
-        pip install $1
+    if [ "$PYCMD" = "python3" ]; then
+	if ! pip3 install --no-index --find-links /var/lib/pip $1 ; then
+            pip3 install $1
+	fi
+    else
+	if ! pip install --no-index --find-links /var/lib/pip $1 ; then
+            pip install $1
+	fi
     fi
 }
-- 
2.39.5