Add Docker 1.12.2-rc1 #2202
Merged
Add Docker 1.12.2-rc1 #2202
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/docker_1.11-dind/Dockerfile b/docker_rc-dind/Dockerfile
similarity index 97%
copy from docker_1.11-dind/Dockerfile
copy to docker_rc-dind/Dockerfile
index 49f6377..8a51427 100644
--- a/docker_1.11-dind/Dockerfile
+++ b/docker_rc-dind/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker:1.11
+FROM docker:1.12-rc
# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
RUN apk add --no-cache \
diff --git a/docker_experimental-dind/dockerd-entrypoint.sh b/docker_rc-dind/dockerd-entrypoint.sh
similarity index 100%
copy from docker_experimental-dind/dockerd-entrypoint.sh
copy to docker_rc-dind/dockerd-entrypoint.sh
diff --git a/docker_1.11-dind/Dockerfile b/docker_rc-experimental-dind/Dockerfile
similarity index 96%
copy from docker_1.11-dind/Dockerfile
copy to docker_rc-experimental-dind/Dockerfile
index 49f6377..603b3d0 100644
--- a/docker_1.11-dind/Dockerfile
+++ b/docker_rc-experimental-dind/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker:1.11
+FROM docker:1.12-rc-experimental
# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
RUN apk add --no-cache \
diff --git a/docker_experimental-dind/dockerd-entrypoint.sh b/docker_rc-experimental-dind/dockerd-entrypoint.sh
similarity index 100%
copy from docker_experimental-dind/dockerd-entrypoint.sh
copy to docker_rc-experimental-dind/dockerd-entrypoint.sh
diff --git a/docker_experimental-git/Dockerfile b/docker_rc-experimental-git/Dockerfile
similarity index 60%
copy from docker_experimental-git/Dockerfile
copy to docker_rc-experimental-git/Dockerfile
index cf72e00..0739f2b 100644
--- a/docker_experimental-git/Dockerfile
+++ b/docker_rc-experimental-git/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker:1.12-experimental
+FROM docker:1.12-rc-experimental
RUN apk add --no-cache \
git \
diff --git a/docker_experimental/Dockerfile b/docker_rc-experimental/Dockerfile
similarity index 81%
copy from docker_experimental/Dockerfile
copy to docker_rc-experimental/Dockerfile
index 0852d0b..e535edc 100644
--- a/docker_experimental/Dockerfile
+++ b/docker_rc-experimental/Dockerfile
@@ -6,8 +6,8 @@ RUN apk add --no-cache \
openssl
ENV DOCKER_BUCKET experimental.docker.com
-ENV DOCKER_VERSION 1.12.1
-ENV DOCKER_SHA256 f92fe0630dd1f20d9678cd7e4043018566e3737001f53171274a4a6ed6baaa08
+ENV DOCKER_VERSION 1.12.2-rc1
+ENV DOCKER_SHA256 d3096cd00f8386e5180c24c7d93284a725577194b43404960029f861fd5a71db
RUN set -x \
&& curl -fSL "https://${DOCKER_BUCKET}/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz" -o docker.tgz \
diff --git a/docker_latest/docker-entrypoint.sh b/docker_rc-experimental/docker-entrypoint.sh
similarity index 100%
copy from docker_latest/docker-entrypoint.sh
copy to docker_rc-experimental/docker-entrypoint.sh
diff --git a/docker_git/Dockerfile b/docker_rc-git/Dockerfile
similarity index 71%
copy from docker_git/Dockerfile
copy to docker_rc-git/Dockerfile
index 05ea3b4..2e89f05 100644
--- a/docker_git/Dockerfile
+++ b/docker_rc-git/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker:1.12
+FROM docker:1.12-rc
RUN apk add --no-cache \
git \
diff --git a/docker_latest/Dockerfile b/docker_rc/Dockerfile
similarity index 76%
copy from docker_latest/Dockerfile
copy to docker_rc/Dockerfile
index 4764465..f1391bb 100644
--- a/docker_latest/Dockerfile
+++ b/docker_rc/Dockerfile
@@ -5,9 +5,9 @@ RUN apk add --no-cache \
curl \
openssl
-ENV DOCKER_BUCKET get.docker.com
-ENV DOCKER_VERSION 1.12.1
-ENV DOCKER_SHA256 05ceec7fd937e1416e5dce12b0b6e1c655907d349d52574319a1e875077ccb79
+ENV DOCKER_BUCKET test.docker.com
+ENV DOCKER_VERSION 1.12.2-rc1
+ENV DOCKER_SHA256 0629b1681343ce333c5125670d63c2ca4e090f9d7de39f822ad35445eef124db
RUN set -x \
&& curl -fSL "https://${DOCKER_BUCKET}/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz" -o docker.tgz \
diff --git a/docker_latest/docker-entrypoint.sh b/docker_rc/docker-entrypoint.sh
similarity index 100%
copy from docker_latest/docker-entrypoint.sh
copy to docker_rc/docker-entrypoint.sh |
|
Build test of #2202; e0af209 ( $ bashbrew build docker:1.12.2-rc1
Building bashbrew/cache:e96ed8cfda5e5938bb31745a6b9420960bc7d32323c30cc86f52f348447e1013 (docker:1.12.2-rc1)
Tagging docker:1.12.2-rc1
Tagging docker:1.12-rc
Tagging docker:rc
$ test/run.sh docker:1.12.2-rc1
testing docker:1.12.2-rc1
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build docker:1.12.2-rc1-dind
Building bashbrew/cache:ba65418265274059759aafb9034fdc7a30f8aa33769f66dcabe81d97bbb04695 (docker:1.12.2-rc1-dind)
Tagging docker:1.12.2-rc1-dind
Tagging docker:1.12-rc-dind
Tagging docker:rc-dind
$ test/run.sh docker:1.12.2-rc1-dind
testing docker:1.12.2-rc1-dind
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'docker-dind' [5/5]...passed
$ bashbrew build docker:1.12.2-rc1-git
Building bashbrew/cache:67df22ea514e511dc50f8e99d5498c2ee6eaf66b66c0fdbed74f489a586acdac (docker:1.12.2-rc1-git)
Tagging docker:1.12.2-rc1-git
Tagging docker:1.12-rc-git
Tagging docker:rc-git
$ test/run.sh docker:1.12.2-rc1-git
testing docker:1.12.2-rc1-git
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build docker:1.12.2-rc1-experimental
Building bashbrew/cache:a31e425257bc680c3c475250e3d641b10edb0736fc0b4fd6d816ccc97a7234c6 (docker:1.12.2-rc1-experimental)
Tagging docker:1.12.2-rc1-experimental
Tagging docker:1.12-rc-experimental
Tagging docker:rc-experimental
$ test/run.sh docker:1.12.2-rc1-experimental
testing docker:1.12.2-rc1-experimental
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build docker:1.12.2-rc1-experimental-dind
Building bashbrew/cache:487298eff693807713f29342691d4e269c9d683e48896aa9abd49ebc45dc2fc2 (docker:1.12.2-rc1-experimental-dind)
Tagging docker:1.12.2-rc1-experimental-dind
Tagging docker:1.12-rc-experimental-dind
Tagging docker:rc-experimental-dind
$ test/run.sh docker:1.12.2-rc1-experimental-dind
testing docker:1.12.2-rc1-experimental-dind
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'docker-dind' [5/5]...passed
$ bashbrew build docker:1.12.2-rc1-experimental-git
Building bashbrew/cache:e616011fb4c84b704c10471d17ee390ddb188f901ee3e911ad57b1b47911444b (docker:1.12.2-rc1-experimental-git)
Tagging docker:1.12.2-rc1-experimental-git
Tagging docker:1.12-rc-experimental-git
Tagging docker:rc-experimental-git
$ test/run.sh docker:1.12.2-rc1-experimental-git
testing docker:1.12.2-rc1-experimental-git
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build docker:1.12.1
Building bashbrew/cache:4d2d16e924ffc8bd068a1fa33fd20d0e84bb1624a0ec84976b0d7280d90202b6 (docker:1.12.1)
Tagging docker:1.12.1
Tagging docker:1.12
Tagging docker:1
Tagging docker:latest
$ test/run.sh docker:1.12.1
testing docker:1.12.1
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build docker:1.12.1-dind
Building bashbrew/cache:bf28d2e82abaac801e7aa94e46c112425de0d94400a8ea0015016e1f90d2a597 (docker:1.12.1-dind)
Tagging docker:1.12.1-dind
Tagging docker:1.12-dind
Tagging docker:1-dind
Tagging docker:dind
$ test/run.sh docker:1.12.1-dind
testing docker:1.12.1-dind
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'docker-dind' [5/5]...passed
$ bashbrew build docker:1.12.1-git
Building bashbrew/cache:5d7cd037f5baf57a796109fd2b76d5045050adca1b589737d9589ba904cb6018 (docker:1.12.1-git)
Tagging docker:1.12.1-git
Tagging docker:1.12-git
Tagging docker:1-git
Tagging docker:git
$ test/run.sh docker:1.12.1-git
testing docker:1.12.1-git
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build docker:1.12.1-experimental
Building bashbrew/cache:0ce37fedb6791aa3d0a5e9966d390a671e884b6211383222cdbf94051814c833 (docker:1.12.1-experimental)
Tagging docker:1.12.1-experimental
Tagging docker:1.12-experimental
Tagging docker:1-experimental
Tagging docker:experimental
$ test/run.sh docker:1.12.1-experimental
testing docker:1.12.1-experimental
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build docker:1.12.1-experimental-dind
Building bashbrew/cache:d911763cd672377215748e292bd35a31528f74868d7cc72e0e369694151a33e9 (docker:1.12.1-experimental-dind)
Tagging docker:1.12.1-experimental-dind
Tagging docker:1.12-experimental-dind
Tagging docker:1-experimental-dind
Tagging docker:experimental-dind
$ test/run.sh docker:1.12.1-experimental-dind
testing docker:1.12.1-experimental-dind
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'docker-dind' [5/5]...passed
$ bashbrew build docker:1.12.1-experimental-git
Building bashbrew/cache:0bf2c4d2b587d0c539f10048f4ad7bbdc22711058b9fffc67c17a44221701fcc (docker:1.12.1-experimental-git)
Tagging docker:1.12.1-experimental-git
Tagging docker:1.12-experimental-git
Tagging docker:1-experimental-git
Tagging docker:experimental-git
$ test/run.sh docker:1.12.1-experimental-git
testing docker:1.12.1-experimental-git
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build docker:1.11.2
Building bashbrew/cache:8d20e1119c64967919d29af3564de26f2e1b3f14d2cdfbf01539ddec6e49f1ed (docker:1.11.2)
Tagging docker:1.11.2
Tagging docker:1.11
$ test/run.sh docker:1.11.2
testing docker:1.11.2
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build docker:1.11.2-dind
Building bashbrew/cache:226b69f306d40d279b534d39fda7eec0773d8ba61945a5b8d3c1198529237062 (docker:1.11.2-dind)
Tagging docker:1.11.2-dind
Tagging docker:1.11-dind
$ test/run.sh docker:1.11.2-dind
testing docker:1.11.2-dind
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'docker-dind' [5/5]...passed
$ bashbrew build docker:1.11.2-git
Building bashbrew/cache:d2a3fe81d746eaa03dbb80fa54bca70835bd64e2f762e8a281051ae611aad1ab (docker:1.11.2-git)
Tagging docker:1.11.2-git
Tagging docker:1.11-git
$ test/run.sh docker:1.11.2-git
testing docker:1.11.2-git
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
|
yosifkit
approved these changes
Sep 28, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.