Merge branch 'update-scripts'

Dockerfile

@@ -6,16 +6,16 @@ ENV DOCKER_VERSION=18.09.7 \
     DOCKER_COMPOSE_VERSION=1.23.2
 
 # Install Docker and Docker Compose
-RUN apk --no-cache add curl util-linux device-mapper py-pip iptables && \
+RUN apk --no-cache add bash curl util-linux device-mapper py-pip iptables && \
     curl https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz | tar zx && \
     mv /docker/* /bin/ && \
     chmod +x /bin/docker* && \
-    pip install docker-compose==${DOCKER_COMPOSE_VERSION}
+    pip install docker-compose==${DOCKER_COMPOSE_VERSION} && \
+    rm -rf /root/.cache
 
-# Include useful functions to start/stop docker daemon in garden-runc containers in Concourse CI.
-# Example: source /docker-lib.sh && start_docker
+# Include functions to start/stop docker daemon
 COPY docker-lib.sh /docker-lib.sh
 COPY entrypoint.sh /entrypoint.sh
 
 ENTRYPOINT ["/entrypoint.sh"]
-CMD ["/bin/sh"]
+CMD ["/bin/bash"]

docker-lib.sh

@@ -1,4 +1,9 @@
-# Ref: https://github.com/concourse/docker-image-resource/blob/master/assets/common.sh
+#!/bin/bash
+# Based on https://github.com/concourse/docker-image-resource/blob/master/assets/common.sh
+
+LOG_FILE=${LOG_FILE:-/tmp/docker.log}
+SKIP_PRIVILEGED=${SKIP_PRIVILEGED:-false}
+STARTUP_TIMEOUT=${STARTUP_TIMEOUT:-20}
 
 sanitize_cgroups() {
   mkdir -p /sys/fs/cgroup
@@ -13,7 +18,7 @@ sanitize_cgroups() {
       continue
     fi
 
-    grouping="$(cat /proc/self/cgroup | cut -d: -f2 | grep "\\<$sys\\>")"
+    grouping="$(cat /proc/self/cgroup | cut -d: -f2 | grep "\\<$sys\\>")" || true
     if [ -z "$grouping" ]; then
       # subsystem not mounted anywhere; mount it on its own
       grouping="$sys"
@@ -38,6 +43,11 @@ sanitize_cgroups() {
       ln -s "$mountpoint" "/sys/fs/cgroup/$sys"
     fi
   done
+
+  if ! test -e /sys/fs/cgroup/systemd ; then
+    mkdir /sys/fs/cgroup/systemd
+    mount -t cgroup -o none,name=systemd none /sys/fs/cgroup/systemd
+  fi
 }
 
 start_docker() {
@@ -51,38 +61,50 @@ start_docker() {
   mkdir -p /var/log
   mkdir -p /var/run
 
-  sanitize_cgroups
+  if [ "$SKIP_PRIVILEGED" = "false" ]; then
+    sanitize_cgroups
 
-  # check for /proc/sys being mounted readonly, as systemd does
-  if grep '/proc/sys\s\+\w\+\s\+ro,' /proc/mounts >/dev/null; then
-    mount -o remount,rw /proc/sys
+    # check for /proc/sys being mounted readonly, as systemd does
+    if grep '/proc/sys\s\+\w\+\s\+ro,' /proc/mounts >/dev/null; then
+      mount -o remount,rw /proc/sys
+    fi
   fi
 
-  local server_args=""
+  local mtu=$(cat /sys/class/net/$(ip route get 8.8.8.8|awk '{ print $5 }')/mtu)
+  local server_args="--mtu ${mtu}"
+  local registry=""
 
   for registry in $1; do
     server_args="${server_args} --insecure-registry ${registry}"
   done
 
   if [ -n "$2" ]; then
-    server_args="${server_args} --registry-mirror=$2"
+    server_args="${server_args} --registry-mirror $2"
   fi
 
-  if [ -n "$3" ]; then
-    server_args="${server_args} -g=$3"
-  fi
+  try_start() {
+    dockerd --data-root /scratch/docker ${server_args} >$LOG_FILE 2>&1 &
+    echo $! > /tmp/docker.pid
 
-  dockerd --data-root /scratch/docker ${server_args} >/tmp/docker.log 2>&1 &
-  echo $! > /tmp/docker.pid
+    sleep 1
 
-  trap stop_docker EXIT
+    echo waiting for docker to come up...
+    until docker info >/dev/null 2>&1; do
+      sleep 1
+      if ! kill -0 "$(cat /tmp/docker.pid)" 2>/dev/null; then
+        return 1
+      fi
+    done
+  }
 
-  sleep 1
+  export server_args LOG_FILE
+  declare -fx try_start
+  trap stop_docker EXIT
 
-  until docker info >/dev/null 2>&1; do
-    echo waiting for docker to come up...
-    sleep 1
-  done
+  if ! timeout ${STARTUP_TIMEOUT} bash -ce 'while true; do try_start && break; done'; then
+    echo Docker failed to start within ${STARTUP_TIMEOUT} seconds.
+    return 1
+  fi
 }
 
 stop_docker() {
@@ -94,6 +116,5 @@ stop_docker() {
   fi
 
   kill -TERM $pid
-  wait $pid
   rm /tmp/docker.pid
 }

entrypoint.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Based on https://github.com/docker/compose/blob/master/docker-compose-entrypoint.sh
 
 set -e