Merge pull request #2 from joshwget/docker-1.12.1

Switch to Docker 1.12.1
rancher · Aug 24, 2016 · 697e24b · 697e24b
2 parents 7d939c2 + 3d68a4e
commit 697e24b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Dockerfile.dapper b/Dockerfile.dapper
@@ -63,8 +63,8 @@ RUN curl -sfL https://github.com/rancher/docker/releases/download/v1.11.2-ros1/d
     mv /assets/docker /assets/docker-1.11.2_arm
 RUN curl -sfL https://github.com/rancher/docker/releases/download/v1.11.2-ros1/docker-1.11.2_arm64.tgz | tar xzf - -C /assets && \
     mv /assets/docker /assets/docker-1.11.2_arm64
-RUN curl -sfL https://get.docker.com/builds/Linux/x86_64/docker-1.12.0.tgz | tar xzf - -C /assets && \
-    mv /assets/docker /assets/docker-1.12.0
+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
 
 ENTRYPOINT ["./scripts/entry"]
 CMD ["ci"]
diff --git a/images/10-docker-1.12.0/prebuild.sh b/images/10-docker-1.12.0/prebuild.sh
diff --git a/images/10-docker-1.12.0/Dockerfile → images/10-docker-1.12.1/Dockerfile b/images/10-docker-1.12.0/Dockerfile → images/10-docker-1.12.1/Dockerfile
diff --git a/images/10-docker-1.12.1/prebuild.sh b/images/10-docker-1.12.1/prebuild.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+
+cp -r /assets/docker-1.12.1 ./images/10-docker-1.12.1/engine