Ensure that /var/cache/apt/archives is present so arvbox apt-get will work. no issue #

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curoverse.com>

diff --git a/tools/arvbox/bin/arvbox b/tools/arvbox/bin/arvbox
index 395129d21b76e6e7aea027e79feb402afd09d2fc..f7ef693df83cbc6ca15c43c07c34aada6a1b15dc 100755 (executable)
--- a/tools/arvbox/bin/arvbox
+++ b/tools/arvbox/bin/arvbox
@@ -124,7 +124,7 @@ run() {
         fi
     fi
 
-    if test ! -z "$TAG"
+    if test -n "$TAG"
     then
         if test $(echo $TAG | cut -c1-1) != '-' ; then
            TAG=":$TAG"

diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.base b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
index 424bbf17dd4f437f7b722a2ab443d1a0202aeda2..d0d84d9b9b5e0851ff4d96e6b8a2a9fa675b6166 100644 (file)
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.base
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
@@ -2,7 +2,8 @@ FROM debian:8
 
 ENV DEBIAN_FRONTEND noninteractive
 
-RUN apt-get clean && \
+RUN mkdir -p /var/cache/apt/archives && \
+    apt-get clean && \
     apt-get update && \
     apt-get -yq --no-install-recommends -o Acquire::Retries=6 install \
     postgresql-9.4 git build-essential runit curl libpq-dev \