From 8b4f513663540e0a3a83ef5d656a97ecc68bca3d Mon Sep 17 00:00:00 2001
From: Alexander Berger <alexander.berger@finnova.com>
Date: Wed, 19 Oct 2016 13:03:58 +0200
Subject: [PATCH 1/3] - Add Docker Engine 1.12.2

---
 Dockerfile.dapper                   | 4 +++-
 images/10-docker-1.12.2/Dockerfile  | 2 ++
 images/10-docker-1.12.2/prebuild.sh | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 images/10-docker-1.12.2/Dockerfile
 create mode 100755 images/10-docker-1.12.2/prebuild.sh

diff --git a/Dockerfile.dapper b/Dockerfile.dapper
index df43716..d106d17 100644
--- 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.2.tgz | tar xzf - -C /assets && \
+    mv /assets/docker /assets/docker-1.12.2
 
 ENTRYPOINT ["./scripts/entry"]
 CMD ["ci"]
diff --git a/images/10-docker-1.12.2/Dockerfile b/images/10-docker-1.12.2/Dockerfile
new file mode 100644
index 0000000..4fc137c
--- /dev/null
+++ b/images/10-docker-1.12.2/Dockerfile
@@ -0,0 +1,2 @@
+FROM scratch
+COPY engine /engine
diff --git a/images/10-docker-1.12.2/prebuild.sh b/images/10-docker-1.12.2/prebuild.sh
new file mode 100755
index 0000000..1d023a6
--- /dev/null
+++ b/images/10-docker-1.12.2/prebuild.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+
+cp -r /assets/docker-1.12.2 ./images/10-docker-1.12.2/engine

From 99d9ec9984aa6a8165d801da61e7b8dd1205d5fc Mon Sep 17 00:00:00 2001
From: Alexander Berger <alexander.berger@finnova.com>
Date: Wed, 19 Oct 2016 13:03:58 +0200
Subject: [PATCH 2/3] - Add temporary build files to .gitingore

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..7ecbc57
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+.dapper
+.dapper.tmp
+dist/images

From 4d4eb018e0d6d7c1c4e9490834ad7a51aa89e61e Mon Sep 17 00:00:00 2001
From: Alexander Berger <alexander.berger@finnova.com>
Date: Wed, 2 Nov 2016 08:01:22 +0100
Subject: [PATCH 3/3] Upgrade from Docker 1.12.2 to 1.12.3

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

diff --git a/Dockerfile.dapper b/Dockerfile.dapper
index d106d17..fe06efc 100644
--- a/Dockerfile.dapper
+++ b/Dockerfile.dapper
@@ -71,8 +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.2.tgz | tar xzf - -C /assets && \
-    mv /assets/docker /assets/docker-1.12.2
+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.2/prebuild.sh b/images/10-docker-1.12.2/prebuild.sh
deleted file mode 100755
index 1d023a6..0000000
--- a/images/10-docker-1.12.2/prebuild.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -e
-
-cp -r /assets/docker-1.12.2 ./images/10-docker-1.12.2/engine
diff --git a/images/10-docker-1.12.2/Dockerfile b/images/10-docker-1.12.3/Dockerfile
similarity index 100%
rename from images/10-docker-1.12.2/Dockerfile
rename to images/10-docker-1.12.3/Dockerfile
diff --git a/images/10-docker-1.12.3/prebuild.sh b/images/10-docker-1.12.3/prebuild.sh
new file mode 100755
index 0000000..21e21ed
--- /dev/null
+++ 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