From 3d68a4ef2f7d6ec25ddf13fc07d48d5fe22d0c43 Mon Sep 17 00:00:00 2001
From: Josh Curl <josh@curl.me>
Date: Wed, 24 Aug 2016 09:56:09 -0700
Subject: [PATCH] Switch to Docker 1.12.1

---
 Dockerfile.dapper                                        | 4 ++--
 images/10-docker-1.12.0/prebuild.sh                      | 4 ----
 images/{10-docker-1.12.0 => 10-docker-1.12.1}/Dockerfile | 0
 images/10-docker-1.12.1/prebuild.sh                      | 4 ++++
 4 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100755 images/10-docker-1.12.0/prebuild.sh
 rename images/{10-docker-1.12.0 => 10-docker-1.12.1}/Dockerfile (100%)
 create mode 100755 images/10-docker-1.12.1/prebuild.sh

diff --git a/Dockerfile.dapper b/Dockerfile.dapper
index 4fc1443..785bf79 100644
--- 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
deleted file mode 100755
index c7e509c..0000000
--- a/images/10-docker-1.12.0/prebuild.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -e
-
-cp -r /assets/docker-1.12.0 ./images/10-docker-1.12.0/engine
diff --git a/images/10-docker-1.12.0/Dockerfile b/images/10-docker-1.12.1/Dockerfile
similarity index 100%
rename from images/10-docker-1.12.0/Dockerfile
rename to 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
new file mode 100755
index 0000000..80328f4
--- /dev/null
+++ 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