Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update docker-library images #3060

Merged
merged 1 commit into from
Jun 13, 2017

Conversation

- `docker`: 17.06.0-ce-rc3, 📎 (docker-library/docker#64)
- `php`: `DEB_BUILD_MULTIARCH` (docker-library/php#451)
@tianon
Copy link
Member Author

tianon commented Jun 13, 2017

Diff:
diff --git a/_bashbrew-list b/_bashbrew-list
index 985ecf7..f3e2295 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -38,9 +38,9 @@ docker:17.06.0
 docker:17.06.0-ce
 docker:17.06.0-ce-dind
 docker:17.06.0-ce-git
-docker:17.06.0-ce-rc2
-docker:17.06.0-ce-rc2-dind
-docker:17.06.0-ce-rc2-git
+docker:17.06.0-ce-rc3
+docker:17.06.0-ce-rc3-dind
+docker:17.06.0-ce-rc3-git
 docker:17.06.0-dind
 docker:17.06.0-git
 docker:dind
diff --git a/docker_17.03-rc/docker-entrypoint.sh b/docker_17.03-rc/docker-entrypoint.sh
index fe790b1..848a4ad 100755
--- a/docker_17.03-rc/docker-entrypoint.sh
+++ b/docker_17.03-rc/docker-entrypoint.sh
@@ -17,4 +17,19 @@ if [ -z "$DOCKER_HOST" -a "$DOCKER_PORT_2375_TCP" ]; then
 	export DOCKER_HOST='tcp://docker:2375'
 fi
 
+if [ "$1" = 'dockerd' ]; then
+	cat >&2 <<-'EOW'
+
+		📎 Hey there!  It looks like you're trying to run a Docker daemon.
+
+		   You probably should use the "dind" image variant instead, something like:
+
+		     docker run --privileged --name some-overlay-docker -d docker:stable-dind --storage-driver=overlay
+
+		   See https://hub.docker.com/_/docker/ for more documentation and usage examples.
+
+	EOW
+	sleep 3
+fi
+
 exec "$@"
diff --git a/docker_edge/docker-entrypoint.sh b/docker_edge/docker-entrypoint.sh
index fe790b1..848a4ad 100755
--- a/docker_edge/docker-entrypoint.sh
+++ b/docker_edge/docker-entrypoint.sh
@@ -17,4 +17,19 @@ if [ -z "$DOCKER_HOST" -a "$DOCKER_PORT_2375_TCP" ]; then
 	export DOCKER_HOST='tcp://docker:2375'
 fi
 
+if [ "$1" = 'dockerd' ]; then
+	cat >&2 <<-'EOW'
+
+		📎 Hey there!  It looks like you're trying to run a Docker daemon.
+
+		   You probably should use the "dind" image variant instead, something like:
+
+		     docker run --privileged --name some-overlay-docker -d docker:stable-dind --storage-driver=overlay
+
+		   See https://hub.docker.com/_/docker/ for more documentation and usage examples.
+
+	EOW
+	sleep 3
+fi
+
 exec "$@"
diff --git a/docker_stable/docker-entrypoint.sh b/docker_stable/docker-entrypoint.sh
index fe790b1..848a4ad 100755
--- a/docker_stable/docker-entrypoint.sh
+++ b/docker_stable/docker-entrypoint.sh
@@ -17,4 +17,19 @@ if [ -z "$DOCKER_HOST" -a "$DOCKER_PORT_2375_TCP" ]; then
 	export DOCKER_HOST='tcp://docker:2375'
 fi
 
+if [ "$1" = 'dockerd' ]; then
+	cat >&2 <<-'EOW'
+
+		📎 Hey there!  It looks like you're trying to run a Docker daemon.
+
+		   You probably should use the "dind" image variant instead, something like:
+
+		     docker run --privileged --name some-overlay-docker -d docker:stable-dind --storage-driver=overlay
+
+		   See https://hub.docker.com/_/docker/ for more documentation and usage examples.
+
+	EOW
+	sleep 3
+fi
+
 exec "$@"
diff --git a/docker_test/Dockerfile b/docker_test/Dockerfile
index 1539b96..5bb4def 100644
--- a/docker_test/Dockerfile
+++ b/docker_test/Dockerfile
@@ -4,7 +4,7 @@ RUN apk add --no-cache \
 		ca-certificates
 
 ENV DOCKER_CHANNEL test
-ENV DOCKER_VERSION 17.06.0-ce-rc2
+ENV DOCKER_VERSION 17.06.0-ce-rc3
 # TODO ENV DOCKER_SHA256
 # https://github.com/docker/docker-ce/blob/5b073ee2cf564edee5adca05eee574142f7627bb/components/packaging/static/hash_files !!
 # (no SHA file artifacts on download.docker.com yet as of 2017-06-07 though)
diff --git a/docker_test/docker-entrypoint.sh b/docker_test/docker-entrypoint.sh
index fe790b1..848a4ad 100755
--- a/docker_test/docker-entrypoint.sh
+++ b/docker_test/docker-entrypoint.sh
@@ -17,4 +17,19 @@ if [ -z "$DOCKER_HOST" -a "$DOCKER_PORT_2375_TCP" ]; then
 	export DOCKER_HOST='tcp://docker:2375'
 fi
 
+if [ "$1" = 'dockerd' ]; then
+	cat >&2 <<-'EOW'
+
+		📎 Hey there!  It looks like you're trying to run a Docker daemon.
+
+		   You probably should use the "dind" image variant instead, something like:
+
+		     docker run --privileged --name some-overlay-docker -d docker:stable-dind --storage-driver=overlay
+
+		   See https://hub.docker.com/_/docker/ for more documentation and usage examples.
+
+	EOW
+	sleep 3
+fi
+
 exec "$@"
diff --git a/php_5-apache/Dockerfile b/php_5-apache/Dockerfile
index b4d2fe0..fb1d936 100644
--- a/php_5-apache/Dockerfile
+++ b/php_5-apache/Dockerfile
@@ -161,6 +161,7 @@ RUN set -xe \
 	&& docker-php-source extract \
 	&& cd /usr/src/php \
 	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+	&& debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \
 	&& ./configure \
 		--build="$gnuArch" \
 		--with-config-file-path="$PHP_INI_DIR" \
@@ -183,7 +184,7 @@ RUN set -xe \
 # bundled pcre is too old for s390x (which isn't exactly a good sign)
 # /usr/src/php/ext/pcre/pcrelib/pcre_jit_compile.c:65:2: error: #error Unsupported architecture
 		--with-pcre-regex=/usr \
-		--with-libdir="lib/$gnuArch" \
+		--with-libdir="lib/$debMultiarch" \
 		\
 		$PHP_EXTRA_CONFIGURE_ARGS \
 	&& make -j "$(nproc)" \
diff --git a/php_5-fpm/Dockerfile b/php_5-fpm/Dockerfile
index c588ab5..38f98c3 100644
--- a/php_5-fpm/Dockerfile
+++ b/php_5-fpm/Dockerfile
@@ -103,6 +103,7 @@ RUN set -xe \
 	&& docker-php-source extract \
 	&& cd /usr/src/php \
 	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+	&& debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \
 	&& ./configure \
 		--build="$gnuArch" \
 		--with-config-file-path="$PHP_INI_DIR" \
@@ -125,7 +126,7 @@ RUN set -xe \
 # bundled pcre is too old for s390x (which isn't exactly a good sign)
 # /usr/src/php/ext/pcre/pcrelib/pcre_jit_compile.c:65:2: error: #error Unsupported architecture
 		--with-pcre-regex=/usr \
-		--with-libdir="lib/$gnuArch" \
+		--with-libdir="lib/$debMultiarch" \
 		\
 		$PHP_EXTRA_CONFIGURE_ARGS \
 	&& make -j "$(nproc)" \
diff --git a/php_5-zts/Dockerfile b/php_5-zts/Dockerfile
index a8bc33a..e40f8b9 100644
--- a/php_5-zts/Dockerfile
+++ b/php_5-zts/Dockerfile
@@ -103,6 +103,7 @@ RUN set -xe \
 	&& docker-php-source extract \
 	&& cd /usr/src/php \
 	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+	&& debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \
 	&& ./configure \
 		--build="$gnuArch" \
 		--with-config-file-path="$PHP_INI_DIR" \
@@ -125,7 +126,7 @@ RUN set -xe \
 # bundled pcre is too old for s390x (which isn't exactly a good sign)
 # /usr/src/php/ext/pcre/pcrelib/pcre_jit_compile.c:65:2: error: #error Unsupported architecture
 		--with-pcre-regex=/usr \
-		--with-libdir="lib/$gnuArch" \
+		--with-libdir="lib/$debMultiarch" \
 		\
 		$PHP_EXTRA_CONFIGURE_ARGS \
 	&& make -j "$(nproc)" \
diff --git a/php_5/Dockerfile b/php_5/Dockerfile
index a8b3891..0576a4b 100644
--- a/php_5/Dockerfile
+++ b/php_5/Dockerfile
@@ -102,6 +102,7 @@ RUN set -xe \
 	&& docker-php-source extract \
 	&& cd /usr/src/php \
 	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+	&& debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \
 	&& ./configure \
 		--build="$gnuArch" \
 		--with-config-file-path="$PHP_INI_DIR" \
@@ -124,7 +125,7 @@ RUN set -xe \
 # bundled pcre is too old for s390x (which isn't exactly a good sign)
 # /usr/src/php/ext/pcre/pcrelib/pcre_jit_compile.c:65:2: error: #error Unsupported architecture
 		--with-pcre-regex=/usr \
-		--with-libdir="lib/$gnuArch" \
+		--with-libdir="lib/$debMultiarch" \
 		\
 		$PHP_EXTRA_CONFIGURE_ARGS \
 	&& make -j "$(nproc)" \
diff --git a/php_7.0-apache/Dockerfile b/php_7.0-apache/Dockerfile
index 593fcb1..e30d451 100644
--- a/php_7.0-apache/Dockerfile
+++ b/php_7.0-apache/Dockerfile
@@ -161,6 +161,7 @@ RUN set -xe \
 	&& docker-php-source extract \
 	&& cd /usr/src/php \
 	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+	&& debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \
 	&& ./configure \
 		--build="$gnuArch" \
 		--with-config-file-path="$PHP_INI_DIR" \
@@ -183,7 +184,7 @@ RUN set -xe \
 # bundled pcre is too old for s390x (which isn't exactly a good sign)
 # /usr/src/php/ext/pcre/pcrelib/pcre_jit_compile.c:65:2: error: #error Unsupported architecture
 		--with-pcre-regex=/usr \
-		--with-libdir="lib/$gnuArch" \
+		--with-libdir="lib/$debMultiarch" \
 		\
 		$PHP_EXTRA_CONFIGURE_ARGS \
 	&& make -j "$(nproc)" \
diff --git a/php_7.0-fpm/Dockerfile b/php_7.0-fpm/Dockerfile
index 35078b4..49aa7f8 100644
--- a/php_7.0-fpm/Dockerfile
+++ b/php_7.0-fpm/Dockerfile
@@ -103,6 +103,7 @@ RUN set -xe \
 	&& docker-php-source extract \
 	&& cd /usr/src/php \
 	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+	&& debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \
 	&& ./configure \
 		--build="$gnuArch" \
 		--with-config-file-path="$PHP_INI_DIR" \
@@ -125,7 +126,7 @@ RUN set -xe \
 # bundled pcre is too old for s390x (which isn't exactly a good sign)
 # /usr/src/php/ext/pcre/pcrelib/pcre_jit_compile.c:65:2: error: #error Unsupported architecture
 		--with-pcre-regex=/usr \
-		--with-libdir="lib/$gnuArch" \
+		--with-libdir="lib/$debMultiarch" \
 		\
 		$PHP_EXTRA_CONFIGURE_ARGS \
 	&& make -j "$(nproc)" \
diff --git a/php_7.0-zts/Dockerfile b/php_7.0-zts/Dockerfile
index 8d60737..787db7e 100644
--- a/php_7.0-zts/Dockerfile
+++ b/php_7.0-zts/Dockerfile
@@ -103,6 +103,7 @@ RUN set -xe \
 	&& docker-php-source extract \
 	&& cd /usr/src/php \
 	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+	&& debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \
 	&& ./configure \
 		--build="$gnuArch" \
 		--with-config-file-path="$PHP_INI_DIR" \
@@ -125,7 +126,7 @@ RUN set -xe \
 # bundled pcre is too old for s390x (which isn't exactly a good sign)
 # /usr/src/php/ext/pcre/pcrelib/pcre_jit_compile.c:65:2: error: #error Unsupported architecture
 		--with-pcre-regex=/usr \
-		--with-libdir="lib/$gnuArch" \
+		--with-libdir="lib/$debMultiarch" \
 		\
 		$PHP_EXTRA_CONFIGURE_ARGS \
 	&& make -j "$(nproc)" \
diff --git a/php_7.0/Dockerfile b/php_7.0/Dockerfile
index ea37560..b632ece 100644
--- a/php_7.0/Dockerfile
+++ b/php_7.0/Dockerfile
@@ -102,6 +102,7 @@ RUN set -xe \
 	&& docker-php-source extract \
 	&& cd /usr/src/php \
 	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+	&& debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \
 	&& ./configure \
 		--build="$gnuArch" \
 		--with-config-file-path="$PHP_INI_DIR" \
@@ -124,7 +125,7 @@ RUN set -xe \
 # bundled pcre is too old for s390x (which isn't exactly a good sign)
 # /usr/src/php/ext/pcre/pcrelib/pcre_jit_compile.c:65:2: error: #error Unsupported architecture
 		--with-pcre-regex=/usr \
-		--with-libdir="lib/$gnuArch" \
+		--with-libdir="lib/$debMultiarch" \
 		\
 		$PHP_EXTRA_CONFIGURE_ARGS \
 	&& make -j "$(nproc)" \
diff --git a/php_apache/Dockerfile b/php_apache/Dockerfile
index 1b91e07..abdbf40 100644
--- a/php_apache/Dockerfile
+++ b/php_apache/Dockerfile
@@ -161,6 +161,7 @@ RUN set -xe \
 	&& docker-php-source extract \
 	&& cd /usr/src/php \
 	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+	&& debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \
 	&& ./configure \
 		--build="$gnuArch" \
 		--with-config-file-path="$PHP_INI_DIR" \
@@ -183,7 +184,7 @@ RUN set -xe \
 # bundled pcre is too old for s390x (which isn't exactly a good sign)
 # /usr/src/php/ext/pcre/pcrelib/pcre_jit_compile.c:65:2: error: #error Unsupported architecture
 		--with-pcre-regex=/usr \
-		--with-libdir="lib/$gnuArch" \
+		--with-libdir="lib/$debMultiarch" \
 		\
 		$PHP_EXTRA_CONFIGURE_ARGS \
 	&& make -j "$(nproc)" \
diff --git a/php_fpm/Dockerfile b/php_fpm/Dockerfile
index e10dbc6..a7228e3 100644
--- a/php_fpm/Dockerfile
+++ b/php_fpm/Dockerfile
@@ -103,6 +103,7 @@ RUN set -xe \
 	&& docker-php-source extract \
 	&& cd /usr/src/php \
 	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+	&& debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \
 	&& ./configure \
 		--build="$gnuArch" \
 		--with-config-file-path="$PHP_INI_DIR" \
@@ -125,7 +126,7 @@ RUN set -xe \
 # bundled pcre is too old for s390x (which isn't exactly a good sign)
 # /usr/src/php/ext/pcre/pcrelib/pcre_jit_compile.c:65:2: error: #error Unsupported architecture
 		--with-pcre-regex=/usr \
-		--with-libdir="lib/$gnuArch" \
+		--with-libdir="lib/$debMultiarch" \
 		\
 		$PHP_EXTRA_CONFIGURE_ARGS \
 	&& make -j "$(nproc)" \
diff --git a/php_latest/Dockerfile b/php_latest/Dockerfile
index 8ceeb23..72ec234 100644
--- a/php_latest/Dockerfile
+++ b/php_latest/Dockerfile
@@ -102,6 +102,7 @@ RUN set -xe \
 	&& docker-php-source extract \
 	&& cd /usr/src/php \
 	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+	&& debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \
 	&& ./configure \
 		--build="$gnuArch" \
 		--with-config-file-path="$PHP_INI_DIR" \
@@ -124,7 +125,7 @@ RUN set -xe \
 # bundled pcre is too old for s390x (which isn't exactly a good sign)
 # /usr/src/php/ext/pcre/pcrelib/pcre_jit_compile.c:65:2: error: #error Unsupported architecture
 		--with-pcre-regex=/usr \
-		--with-libdir="lib/$gnuArch" \
+		--with-libdir="lib/$debMultiarch" \
 		\
 		$PHP_EXTRA_CONFIGURE_ARGS \
 	&& make -j "$(nproc)" \
diff --git a/php_zts/Dockerfile b/php_zts/Dockerfile
index 3e7890a..fe1dfe5 100644
--- a/php_zts/Dockerfile
+++ b/php_zts/Dockerfile
@@ -103,6 +103,7 @@ RUN set -xe \
 	&& docker-php-source extract \
 	&& cd /usr/src/php \
 	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+	&& debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \
 	&& ./configure \
 		--build="$gnuArch" \
 		--with-config-file-path="$PHP_INI_DIR" \
@@ -125,7 +126,7 @@ RUN set -xe \
 # bundled pcre is too old for s390x (which isn't exactly a good sign)
 # /usr/src/php/ext/pcre/pcrelib/pcre_jit_compile.c:65:2: error: #error Unsupported architecture
 		--with-pcre-regex=/usr \
-		--with-libdir="lib/$gnuArch" \
+		--with-libdir="lib/$debMultiarch" \
 		\
 		$PHP_EXTRA_CONFIGURE_ARGS \
 	&& make -j "$(nproc)" \

@tianon
Copy link
Member Author

tianon commented Jun 13, 2017

Build test of #3060; fa6eff5 (docker, php):

$ bashbrew build docker:17.06.0-ce-rc3
Building bashbrew/cache:9626c4163b7a69a5eed131de55b7862e585e8c9a462dcc601c5b5325745efe25 (docker:17.06.0-ce-rc3)
Tagging docker:17.06.0-ce-rc3
Tagging docker:17.06.0-ce
Tagging docker:17.06.0
Tagging docker:17.06-rc
Tagging docker:rc
Tagging docker:test

$ test/run.sh docker:17.06.0-ce-rc3
testing docker:17.06.0-ce-rc3
	'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:17.06.0-ce-rc3-dind
Building bashbrew/cache:bfc96f8b814598f06c9f04718ba744db0c47760246e0b1b471430c9ebe3260c2 (docker:17.06.0-ce-rc3-dind)
Tagging docker:17.06.0-ce-rc3-dind
Tagging docker:17.06.0-ce-dind
Tagging docker:17.06.0-dind
Tagging docker:17.06-rc-dind
Tagging docker:rc-dind
Tagging docker:test-dind

$ test/run.sh docker:17.06.0-ce-rc3-dind
testing docker:17.06.0-ce-rc3-dind
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'docker-dind' [5/6]...passed
	'docker-registry-push-pull' [6/6]...passed


$ bashbrew build docker:17.06.0-ce-rc3-git
Building bashbrew/cache:e5da74f141f828c11a30ab8b1fbcd44cde5de801fe2538c3db0589d7223a0c5a (docker:17.06.0-ce-rc3-git)
Tagging docker:17.06.0-ce-rc3-git
Tagging docker:17.06.0-ce-git
Tagging docker:17.06.0-git
Tagging docker:17.06-rc-git
Tagging docker:rc-git
Tagging docker:test-git

$ test/run.sh docker:17.06.0-ce-rc3-git
testing docker:17.06.0-ce-rc3-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:17.05.0-ce
Building bashbrew/cache:7abfdbcff96c60d9e51096dae86087e5fb5d1d92e5b3673cef96af6db61a6e6b (docker:17.05.0-ce)
Tagging docker:17.05.0-ce
Tagging docker:17.05.0
Tagging docker:17.05
Tagging docker:17
Tagging docker:latest
Tagging docker:edge

$ test/run.sh docker:17.05.0-ce
testing docker:17.05.0-ce
	'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:17.05.0-ce-dind
Building bashbrew/cache:1aafa8b91a5e6828c54c08ad01d351717292c8d11eead782d50a665ae8e03d8f (docker:17.05.0-ce-dind)
Tagging docker:17.05.0-ce-dind
Tagging docker:17.05.0-dind
Tagging docker:17.05-dind
Tagging docker:17-dind
Tagging docker:dind
Tagging docker:edge-dind

$ test/run.sh docker:17.05.0-ce-dind
testing docker:17.05.0-ce-dind
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'docker-dind' [5/6]...passed
	'docker-registry-push-pull' [6/6]...passed


$ bashbrew build docker:17.05.0-ce-git
Building bashbrew/cache:ddf434567f87cb2683c9ab295a85e0c3cf34de220a5a6c06d4a66ed6280cac50 (docker:17.05.0-ce-git)
Tagging docker:17.05.0-ce-git
Tagging docker:17.05.0-git
Tagging docker:17.05-git
Tagging docker:17-git
Tagging docker:git
Tagging docker:edge-git

$ test/run.sh docker:17.05.0-ce-git
testing docker:17.05.0-ce-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:17.03.2-ce-rc1
Building bashbrew/cache:cee40cc4cc50844f552529f52c51bf5976693028813c65a6113c48a86518826e (docker:17.03.2-ce-rc1)
Tagging docker:17.03.2-ce-rc1
Tagging docker:17.03.2-ce
Tagging docker:17.03.2
Tagging docker:17.03-rc

$ test/run.sh docker:17.03.2-ce-rc1
testing docker:17.03.2-ce-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:17.03.2-ce-rc1-dind
Building bashbrew/cache:3a416f5778830dfbc0f4ce3bf8da6be814a1ab05b8e53ec1576a4b30503338b0 (docker:17.03.2-ce-rc1-dind)
Tagging docker:17.03.2-ce-rc1-dind
Tagging docker:17.03.2-ce-dind
Tagging docker:17.03.2-dind
Tagging docker:17.03-rc-dind

$ test/run.sh docker:17.03.2-ce-rc1-dind
testing docker:17.03.2-ce-rc1-dind
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'docker-dind' [5/6]...passed
	'docker-registry-push-pull' [6/6]...passed


$ bashbrew build docker:17.03.2-ce-rc1-git
Building bashbrew/cache:f4aaca9dd0fb3ee693515a06bed3b76a2e87dd1b3a94a4521e5f9304b9a6ba18 (docker:17.03.2-ce-rc1-git)
Tagging docker:17.03.2-ce-rc1-git
Tagging docker:17.03.2-ce-git
Tagging docker:17.03.2-git
Tagging docker:17.03-rc-git

$ test/run.sh docker:17.03.2-ce-rc1-git
testing docker:17.03.2-ce-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:17.03.1-ce
Building bashbrew/cache:df8efb70f3c0570589cac9c7c682784c946407185b7ee0821b02d6b9512c691d (docker:17.03.1-ce)
Tagging docker:17.03.1-ce
Tagging docker:17.03.1
Tagging docker:17.03
Tagging docker:stable

$ test/run.sh docker:17.03.1-ce
testing docker:17.03.1-ce
	'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:17.03.1-ce-dind
Building bashbrew/cache:9d3334478434a69cdec47c10f37ccef07288a9bb26685f612c15ac9b94a476a8 (docker:17.03.1-ce-dind)
Tagging docker:17.03.1-ce-dind
Tagging docker:17.03.1-dind
Tagging docker:17.03-dind
Tagging docker:stable-dind

$ test/run.sh docker:17.03.1-ce-dind
testing docker:17.03.1-ce-dind
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'docker-dind' [5/6]...passed
	'docker-registry-push-pull' [6/6]...passed


$ bashbrew build docker:17.03.1-ce-git
Building bashbrew/cache:641ce78b72d7cdcf921ffd047ac433db55ab95da7d7fe8be04970be94c6743ca (docker:17.03.1-ce-git)
Tagging docker:17.03.1-ce-git
Tagging docker:17.03.1-git
Tagging docker:17.03-git
Tagging docker:stable-git

$ test/run.sh docker:17.03.1-ce-git
testing docker:17.03.1-ce-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 php:7.1.6-cli
Building bashbrew/cache:0e02ae5f9132d59653e12be0455c81db4ccbb6b7dfba0c906690ed9627e1b0f1 (php:7.1.6-cli)
Tagging php:7.1.6-cli
Tagging php:7.1-cli
Tagging php:7-cli
Tagging php:cli
Tagging php:7.1.6
Tagging php:7.1
Tagging php:7
Tagging php:latest

$ test/run.sh php:7.1.6-cli
testing php:7.1.6-cli
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'php-ext-install' [5/6]...passed
	'php-hello-world' [6/6]...passed


$ bashbrew build php:7.1.6-alpine
Using bashbrew/cache:3e6895933fa0659b96249dc439932556a0d4ed53bb1e9bc9ce1d2824cd35c6cf (php:7.1.6-alpine)
Tagging php:7.1.6-alpine
Tagging php:7.1-alpine
Tagging php:7-alpine
Tagging php:alpine

$ test/run.sh php:7.1.6-alpine
testing php:7.1.6-alpine
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'php-ext-install' [5/6]...passed
	'php-hello-world' [6/6]...passed


$ bashbrew build php:7.1.6-apache
Building bashbrew/cache:b912c0e64870ac84831bd8300abf28ac2f9b0f988c00077d9612756b71cc819d (php:7.1.6-apache)
Tagging php:7.1.6-apache
Tagging php:7.1-apache
Tagging php:7-apache
Tagging php:apache

$ test/run.sh php:7.1.6-apache
testing php:7.1.6-apache
	'utc' [1/7]...passed
	'cve-2014--shellshock' [2/7]...passed
	'no-hard-coded-passwords' [3/7]...passed
	'override-cmd' [4/7]...passed
	'php-ext-install' [5/7]...passed
	'php-hello-world' [6/7]...passed
	'php-apache-hello-web' [7/7]...passed


$ bashbrew build php:7.1.6-fpm
Building bashbrew/cache:192f9af9211e90c76f9722b1358634f4b3631a88ead4ebbf2f070f18a7664009 (php:7.1.6-fpm)
Tagging php:7.1.6-fpm
Tagging php:7.1-fpm
Tagging php:7-fpm
Tagging php:fpm

$ test/run.sh php:7.1.6-fpm
testing php:7.1.6-fpm
	'utc' [1/7]...passed
	'cve-2014--shellshock' [2/7]...passed
	'no-hard-coded-passwords' [3/7]...passed
	'override-cmd' [4/7]...passed
	'php-ext-install' [5/7]...passed
	'php-hello-world' [6/7]...passed
	'php-fpm-hello-web' [7/7]...passed


$ bashbrew build php:7.1.6-fpm-alpine
Using bashbrew/cache:6ae8405892d95ee481928bd7773b63d369d5d134e8a25ca79245ac2f61328f7f (php:7.1.6-fpm-alpine)
Tagging php:7.1.6-fpm-alpine
Tagging php:7.1-fpm-alpine
Tagging php:7-fpm-alpine
Tagging php:fpm-alpine

$ test/run.sh php:7.1.6-fpm-alpine
testing php:7.1.6-fpm-alpine
	'utc' [1/7]...passed
	'cve-2014--shellshock' [2/7]...passed
	'no-hard-coded-passwords' [3/7]...passed
	'override-cmd' [4/7]...passed
	'php-ext-install' [5/7]...passed
	'php-hello-world' [6/7]...passed
	'php-fpm-hello-web' [7/7]...passed


$ bashbrew build php:7.1.6-zts
Building bashbrew/cache:b4f11bc0588d6f6c9b5e2f5a6bee7a26fe070ac5f01f0dc9aef5bf1619ce3e6f (php:7.1.6-zts)
Tagging php:7.1.6-zts
Tagging php:7.1-zts
Tagging php:7-zts
Tagging php:zts

$ test/run.sh php:7.1.6-zts
testing php:7.1.6-zts
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'php-ext-install' [5/6]...passed
	'php-hello-world' [6/6]...passed


$ bashbrew build php:7.1.6-zts-alpine
Using bashbrew/cache:e184ee16ff248766f5901576c3e0d42f82f2056fa5c6387933734d1d7f813869 (php:7.1.6-zts-alpine)
Tagging php:7.1.6-zts-alpine
Tagging php:7.1-zts-alpine
Tagging php:7-zts-alpine
Tagging php:zts-alpine

$ test/run.sh php:7.1.6-zts-alpine
testing php:7.1.6-zts-alpine
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'php-ext-install' [5/6]...passed
	'php-hello-world' [6/6]...passed


$ bashbrew build php:7.0.20-cli
Building bashbrew/cache:b643d817f923c801f4ae6ee7e74c222c9c2b5c3a757559a133d057cfc0b92d0f (php:7.0.20-cli)
Tagging php:7.0.20-cli
Tagging php:7.0-cli
Tagging php:7.0.20
Tagging php:7.0

$ test/run.sh php:7.0.20-cli
testing php:7.0.20-cli
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'php-ext-install' [5/6]...passed
	'php-hello-world' [6/6]...passed


$ bashbrew build php:7.0.20-alpine
Using bashbrew/cache:29d739e06c9414cddc4922e6ea426cf7f321c21547043dcddd14cf95f111d687 (php:7.0.20-alpine)
Tagging php:7.0.20-alpine
Tagging php:7.0-alpine

$ test/run.sh php:7.0.20-alpine
testing php:7.0.20-alpine
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'php-ext-install' [5/6]...passed
	'php-hello-world' [6/6]...passed


$ bashbrew build php:7.0.20-apache
Building bashbrew/cache:ff00bcd66a36301d00ce351ecc4e04a0c13d7a8a5e7edc0d11311ff537fae6b8 (php:7.0.20-apache)
Tagging php:7.0.20-apache
Tagging php:7.0-apache

$ test/run.sh php:7.0.20-apache
testing php:7.0.20-apache
	'utc' [1/7]...passed
	'cve-2014--shellshock' [2/7]...passed
	'no-hard-coded-passwords' [3/7]...passed
	'override-cmd' [4/7]...passed
	'php-ext-install' [5/7]...passed
	'php-hello-world' [6/7]...passed
	'php-apache-hello-web' [7/7]...passed


$ bashbrew build php:7.0.20-fpm
Building bashbrew/cache:2636e88bf34a783aae808c3fcc4da82854f6cfe51ed698e16c06f20c64704bdf (php:7.0.20-fpm)
Tagging php:7.0.20-fpm
Tagging php:7.0-fpm

$ test/run.sh php:7.0.20-fpm
testing php:7.0.20-fpm
	'utc' [1/7]...passed
	'cve-2014--shellshock' [2/7]...passed
	'no-hard-coded-passwords' [3/7]...passed
	'override-cmd' [4/7]...passed
	'php-ext-install' [5/7]...passed
	'php-hello-world' [6/7]...passed
	'php-fpm-hello-web' [7/7]...passed


$ bashbrew build php:7.0.20-fpm-alpine
Using bashbrew/cache:27f1e80d664aa39e396976fa9bfdf3e0adb267f7a352c8bc250813ea1f685a9a (php:7.0.20-fpm-alpine)
Tagging php:7.0.20-fpm-alpine
Tagging php:7.0-fpm-alpine

$ test/run.sh php:7.0.20-fpm-alpine
testing php:7.0.20-fpm-alpine
	'utc' [1/7]...passed
	'cve-2014--shellshock' [2/7]...passed
	'no-hard-coded-passwords' [3/7]...passed
	'override-cmd' [4/7]...passed
	'php-ext-install' [5/7]...passed
	'php-hello-world' [6/7]...passed
	'php-fpm-hello-web' [7/7]...passed


$ bashbrew build php:7.0.20-zts
Building bashbrew/cache:e6df677dcde8109f2d33a03432ec23c896f2f8fd41b13b792f64786362fec40c (php:7.0.20-zts)
Tagging php:7.0.20-zts
Tagging php:7.0-zts

$ test/run.sh php:7.0.20-zts
testing php:7.0.20-zts
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'php-ext-install' [5/6]...passed
	'php-hello-world' [6/6]...passed


$ bashbrew build php:7.0.20-zts-alpine
Using bashbrew/cache:156bf2f9b0b0521a8684152d2450dacde2e1c142296bb78be7f94dcf0f18b084 (php:7.0.20-zts-alpine)
Tagging php:7.0.20-zts-alpine
Tagging php:7.0-zts-alpine

$ test/run.sh php:7.0.20-zts-alpine
testing php:7.0.20-zts-alpine
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'php-ext-install' [5/6]...passed
	'php-hello-world' [6/6]...passed


$ bashbrew build php:5.6.30-cli
Building bashbrew/cache:7cefc9cd8fb99a146c10db2c4c7c1e6aba14d43d328dfa81ec21d1f0193fc8ac (php:5.6.30-cli)
Tagging php:5.6.30-cli
Tagging php:5.6-cli
Tagging php:5-cli
Tagging php:5.6.30
Tagging php:5.6
Tagging php:5

$ test/run.sh php:5.6.30-cli
testing php:5.6.30-cli
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'php-ext-install' [5/6]...passed
	'php-hello-world' [6/6]...passed


$ bashbrew build php:5.6.30-alpine
Using bashbrew/cache:75711ab2929c50d0ae81165ff24f50abe4d1c9ba13c02e4da443c56392a646ab (php:5.6.30-alpine)
Tagging php:5.6.30-alpine
Tagging php:5.6-alpine
Tagging php:5-alpine

$ test/run.sh php:5.6.30-alpine
testing php:5.6.30-alpine
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'php-ext-install' [5/6]...passed
	'php-hello-world' [6/6]...passed


$ bashbrew build php:5.6.30-apache
Building bashbrew/cache:6aa53db013b3b48987900d14431b02a4eb3b2e15605cffde54bf4995ecac487e (php:5.6.30-apache)
Tagging php:5.6.30-apache
Tagging php:5.6-apache
Tagging php:5-apache

$ test/run.sh php:5.6.30-apache
testing php:5.6.30-apache
	'utc' [1/7]...passed
	'cve-2014--shellshock' [2/7]...passed
	'no-hard-coded-passwords' [3/7]...passed
	'override-cmd' [4/7]...passed
	'php-ext-install' [5/7]...passed
	'php-hello-world' [6/7]...passed
	'php-apache-hello-web' [7/7]...passed


$ bashbrew build php:5.6.30-fpm
Building bashbrew/cache:28c7c47caa9ea76ec61ff13d4c260b22194eba344ebae84576f732f67cf6352d (php:5.6.30-fpm)
Tagging php:5.6.30-fpm
Tagging php:5.6-fpm
Tagging php:5-fpm

$ test/run.sh php:5.6.30-fpm
testing php:5.6.30-fpm
	'utc' [1/7]...passed
	'cve-2014--shellshock' [2/7]...passed
	'no-hard-coded-passwords' [3/7]...passed
	'override-cmd' [4/7]...passed
	'php-ext-install' [5/7]...passed
	'php-hello-world' [6/7]...passed
	'php-fpm-hello-web' [7/7]...passed


$ bashbrew build php:5.6.30-fpm-alpine
Using bashbrew/cache:6f8d4558148f02e419e7788431d29dca968d1751a0e045768fa3e935e2aef362 (php:5.6.30-fpm-alpine)
Tagging php:5.6.30-fpm-alpine
Tagging php:5.6-fpm-alpine
Tagging php:5-fpm-alpine

$ test/run.sh php:5.6.30-fpm-alpine
testing php:5.6.30-fpm-alpine
	'utc' [1/7]...passed
	'cve-2014--shellshock' [2/7]...passed
	'no-hard-coded-passwords' [3/7]...passed
	'override-cmd' [4/7]...passed
	'php-ext-install' [5/7]...passed
	'php-hello-world' [6/7]...passed
	'php-fpm-hello-web' [7/7]...passed


$ bashbrew build php:5.6.30-zts
Building bashbrew/cache:b7f2dbf150a5032efab80346a35bd2577b9971f53dd990e961e436a31d718326 (php:5.6.30-zts)
Tagging php:5.6.30-zts
Tagging php:5.6-zts
Tagging php:5-zts

$ test/run.sh php:5.6.30-zts
testing php:5.6.30-zts
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'php-ext-install' [5/6]...passed
	'php-hello-world' [6/6]...passed


$ bashbrew build php:5.6.30-zts-alpine
Using bashbrew/cache:ea58a6e26a18f4bda41c4bbd0daad406a18d17764bbb4d4e8386e271a932707c (php:5.6.30-zts-alpine)
Tagging php:5.6.30-zts-alpine
Tagging php:5.6-zts-alpine
Tagging php:5-zts-alpine

$ test/run.sh php:5.6.30-zts-alpine
testing php:5.6.30-zts-alpine
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'php-ext-install' [5/6]...passed
	'php-hello-world' [6/6]...passed

@yosifkit yosifkit merged commit 65dfe3e into docker-library:master Jun 13, 2017
@yosifkit yosifkit deleted the update-docker-library branch June 13, 2017 21:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants