[ARVADOS] updated: 1.1.2-45-g9c01b4b

[Git user]

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

       via  9c01b4bacbfce89f52ad73830d1d9f3f4dc04ff9 (commit)
      from  2e34a09b23917fb99c37b480e70edbfd35308a71 (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 9c01b4bacbfce89f52ad73830d1d9f3f4dc04ff9
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Tue Jan 9 17:49:07 2018 -0500

    12940: Fix fallback when overlay2 isn't available for docker-in-docker
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.base b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
index f667bc1..83d507b 100644
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.base
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
@@ -92,9 +92,6 @@ ADD crunch-setup.sh gitolite.rc \
     application_yml_override.py api-setup.sh \
     /usr/local/lib/arvbox/
 
-RUN mkdir /etc/docker
-ADD daemon.json /etc/docker/
-
 ADD runit /etc/runit
 
 # Start the supervisor.
diff --git a/tools/arvbox/lib/arvbox/docker/service/docker/run b/tools/arvbox/lib/arvbox/docker/service/docker/run
index cbc8486..b6dbaf1 100755
--- a/tools/arvbox/lib/arvbox/docker/service/docker/run
+++ b/tools/arvbox/lib/arvbox/docker/service/docker/run
@@ -100,6 +100,12 @@ rm -rf /var/run/docker.pid
 read pid cmd state ppid pgrp session tty_nr tpgid rest < /proc/self/stat
 trap "kill -TERM -$pgrp; exit" EXIT TERM KILL SIGKILL SIGTERM SIGQUIT
 
-if ! docker daemon --storage-driver=overlay $DOCKER_DAEMON_ARGS ; then
-    docker daemon $DOCKER_DAEMON_ARGS
+mkdir /etc/docker
+# Prefer overlay2
+echo '{"storage-driver": "overlay2"}' > /etc/docker/daemon.json
+
+if ! dockerd ; then
+    # Oops overlay2 didn't work, let docker choose a default.
+    echo '{}' > /etc/docker/daemon.json
+    dockerd
 fi

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


hooks/post-receive
--