Merge pull request #3 from alex-berger/docker-1.12.2

Upgrade from Docker Engine version 1.12.1 to 1.12.3
rancher · Nov 3, 2016 · 81e8c2c · 81e8c2c
2 parents 9fe04ad + 4d4eb01
commit 81e8c2c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+.dapper
+.dapper.tmp
+dist/images
diff --git a/Dockerfile.dapper b/Dockerfile.dapper
@@ -31,7 +31,7 @@ ARG DOCKER_URL_arm64=https://github.com/rancher/docker/releases/download/${DOCKE
 ENV DOCKER_URL DOCKER_URL_${ARCH}
 
 # Export all ARGS as ENV
-ENV ARCH=${ARCH} 
+ENV ARCH=${ARCH}
 ENV DISTRIB_ID=${DISTRIB_ID}
 ENV DOCKER_PATCH_VERSION=${DOCKER_PATCH_VERSION}
 ENV DOCKER_URL=${DOCKER_URL}
@@ -71,6 +71,8 @@ RUN curl -sfL https://github.com/rancher/docker/releases/download/v1.11.2-ros1/d
     mv /assets/docker /assets/docker-1.11.2_arm64
 RUN curl -sfL https://get.docker.com/builds/Linux/x86_64/docker-1.12.1.tgz | tar xzf - -C /assets && \
     mv /assets/docker /assets/docker-1.12.1
+RUN curl -sfL https://get.docker.com/builds/Linux/x86_64/docker-1.12.3.tgz | tar xzf - -C /assets && \
+    mv /assets/docker /assets/docker-1.12.3
 
 ENTRYPOINT ["./scripts/entry"]
 CMD ["ci"]
diff --git a/images/10-docker-1.12.3/Dockerfile b/images/10-docker-1.12.3/Dockerfile
@@ -0,0 +1,2 @@
+FROM scratch
+COPY engine /engine
diff --git a/images/10-docker-1.12.3/prebuild.sh b/images/10-docker-1.12.3/prebuild.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+
+cp -r /assets/docker-1.12.3 ./images/10-docker-1.12.3/engine