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 #2546

Merged
merged 1 commit into from
Jan 18, 2017

Conversation

tianon
Copy link
Member

@tianon tianon commented Jan 18, 2017

- `docker`: 1.13.0
- `hylang`: 0.12.0
- `mariadb`: 10.1.21+maria-1~jessie
- `redis`: add Windows Server Core and Nano Server variants (redis/docker-library-redis#78)
- `rocket.chat`: 0.49.3
- `tomcat`: 8.5.11, 9.0.0.M17
@tianon
Copy link
Member Author

tianon commented Jan 18, 2017

diff --git a/docker_1.11-dind/Dockerfile b/docker_1.11-dind/Dockerfile
deleted file mode 100644
index 49f6377..0000000
diff --git a/docker_1.11-dind/dockerd-entrypoint.sh b/docker_1.11-dind/dockerd-entrypoint.sh
deleted file mode 100755
index 95680bd..0000000
diff --git a/docker_1.11-git/Dockerfile b/docker_1.11-git/Dockerfile
deleted file mode 100644
index 382e08c..0000000
diff --git a/docker_1.11/Dockerfile b/docker_1.11/Dockerfile
deleted file mode 100644
index 880af8c..0000000
diff --git a/docker_dind/Dockerfile b/docker_1.12-dind/Dockerfile
similarity index 100%
copy from docker_dind/Dockerfile
copy to docker_1.12-dind/Dockerfile
diff --git a/docker_experimental-dind/dockerd-entrypoint.sh b/docker_1.12-dind/dockerd-entrypoint.sh
similarity index 100%
rename from docker_experimental-dind/dockerd-entrypoint.sh
rename to docker_1.12-dind/dockerd-entrypoint.sh
diff --git a/docker_experimental-dind/Dockerfile b/docker_1.12-experimental-dind/Dockerfile
similarity index 100%
rename from docker_experimental-dind/Dockerfile
rename to docker_1.12-experimental-dind/Dockerfile
diff --git a/docker_rc-dind/dockerd-entrypoint.sh b/docker_1.12-experimental-dind/dockerd-entrypoint.sh
similarity index 100%
rename from docker_rc-dind/dockerd-entrypoint.sh
rename to docker_1.12-experimental-dind/dockerd-entrypoint.sh
diff --git a/docker_experimental-git/Dockerfile b/docker_1.12-experimental-git/Dockerfile
similarity index 100%
rename from docker_experimental-git/Dockerfile
rename to docker_1.12-experimental-git/Dockerfile
diff --git a/docker_experimental/Dockerfile b/docker_1.12-experimental/Dockerfile
similarity index 100%
rename from docker_experimental/Dockerfile
rename to docker_1.12-experimental/Dockerfile
diff --git a/docker_experimental/docker-entrypoint.sh b/docker_1.12-experimental/docker-entrypoint.sh
similarity index 100%
rename from docker_experimental/docker-entrypoint.sh
rename to docker_1.12-experimental/docker-entrypoint.sh
diff --git a/docker_git/Dockerfile b/docker_1.12-git/Dockerfile
similarity index 100%
copy from docker_git/Dockerfile
copy to docker_1.12-git/Dockerfile
diff --git a/docker_latest/Dockerfile b/docker_1.12/Dockerfile
similarity index 100%
copy from docker_latest/Dockerfile
copy to docker_1.12/Dockerfile
diff --git a/docker_1.11/docker-entrypoint.sh b/docker_1.12/docker-entrypoint.sh
similarity index 100%
rename from docker_1.11/docker-entrypoint.sh
rename to docker_1.12/docker-entrypoint.sh
diff --git a/docker_dind/Dockerfile b/docker_dind/Dockerfile
index 7621999..d8f8982 100644
--- a/docker_dind/Dockerfile
+++ b/docker_dind/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker:1.12
+FROM docker:1.13
 
 # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
 RUN apk add --no-cache \
diff --git a/docker_git/Dockerfile b/docker_git/Dockerfile
index 05ea3b4..2cbf805 100644
--- a/docker_git/Dockerfile
+++ b/docker_git/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker:1.12
+FROM docker:1.13
 
 RUN apk add --no-cache \
 		git \
diff --git a/docker_latest/Dockerfile b/docker_latest/Dockerfile
index e98fdff..c441a7e 100644
--- a/docker_latest/Dockerfile
+++ b/docker_latest/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.4
+FROM alpine:3.5
 
 RUN apk add --no-cache \
 		ca-certificates \
@@ -6,8 +6,8 @@ RUN apk add --no-cache \
 		openssl
 
 ENV DOCKER_BUCKET get.docker.com
-ENV DOCKER_VERSION 1.12.6
-ENV DOCKER_SHA256 cadc6025c841e034506703a06cf54204e51d0cadfae4bae62628ac648d82efdd
+ENV DOCKER_VERSION 1.13.0
+ENV DOCKER_SHA256 fc194bb95640b1396283e5b23b5ff9d1b69a5e418b5b3d774f303a7642162ad6
 
 RUN set -x \
 	&& curl -fSL "https://${DOCKER_BUCKET}/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz" -o docker.tgz \
diff --git a/docker_rc-dind/Dockerfile b/docker_rc-dind/Dockerfile
deleted file mode 100644
index 75d3b70..0000000
diff --git a/docker_rc-git/Dockerfile b/docker_rc-git/Dockerfile
deleted file mode 100644
index 8e2f1b2..0000000
diff --git a/docker_rc/Dockerfile b/docker_rc/Dockerfile
deleted file mode 100644
index a3487f1..0000000
diff --git a/docker_rc/docker-entrypoint.sh b/docker_rc/docker-entrypoint.sh
deleted file mode 100755
index fe790b1..0000000
diff --git a/mariadb_latest/Dockerfile b/mariadb_latest/Dockerfile
index 34a52ea..413a155 100644
--- a/mariadb_latest/Dockerfile
+++ b/mariadb_latest/Dockerfile
@@ -58,7 +58,7 @@ RUN echo "deb https://repo.percona.com/apt jessie main" > /etc/apt/sources.list.
 	} > /etc/apt/preferences.d/percona
 
 ENV MARIADB_MAJOR 10.1
-ENV MARIADB_VERSION 10.1.20+maria-1~jessie
+ENV MARIADB_VERSION 10.1.21+maria-1~jessie
 
 RUN echo "deb http://ftp.osuosl.org/pub/mariadb/repo/$MARIADB_MAJOR/debian jessie main" > /etc/apt/sources.list.d/mariadb.list \
 	&& { \
diff --git a/redis_3.0-nanoserver/Dockerfile b/redis_3.0-nanoserver/Dockerfile
new file mode 100644
index 0000000..5758a96
--- /dev/null
+++ b/redis_3.0-nanoserver/Dockerfile
@@ -0,0 +1,32 @@
+FROM microsoft/nanoserver
+
+# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+# PATH isn't actually set in the Docker image, so we have to set it from within the container
+RUN $newPath = ('C:\Redis;{0}' -f $env:PATH); \
+	Write-Host ('Updating PATH: {0}' -f $newPath); \
+# Nano Server does not have "[Environment]::SetEnvironmentVariable()"
+	setx /M PATH $newPath;
+# doing this first to share cache across versions more aggressively
+
+ENV REDIS_VERSION 3.0.504
+ENV REDIS_DOWNLOAD_URL https://github.com/MSOpenTech/redis/releases/download/win-${REDIS_VERSION}/Redis-x64-${REDIS_VERSION}.zip
+
+RUN Write-Host ('Downloading {0} ...' -f $env:REDIS_DOWNLOAD_URL); \
+	Invoke-WebRequest -Uri $env:REDIS_DOWNLOAD_URL -OutFile 'redis.zip'; \
+	\
+	Write-Host 'Expanding ...'; \
+	Expand-Archive redis.zip -DestinationPath C:\Redis; \
+	\
+	Write-Host 'Verifying install ("redis-server --version") ...'; \
+	redis-server --version; \
+	\
+	Write-Host 'Removing ...'; \
+	Remove-Item redis.zip -Force
+
+VOLUME C:\\data
+WORKDIR C:\\data
+
+EXPOSE 6379
+CMD ["redis-server.exe"]
diff --git a/redis_3.0-windowsservercore/Dockerfile b/redis_3.0-windowsservercore/Dockerfile
new file mode 100644
index 0000000..d8f7afb
--- /dev/null
+++ b/redis_3.0-windowsservercore/Dockerfile
@@ -0,0 +1,32 @@
+FROM microsoft/windowsservercore
+
+# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+# PATH isn't actually set in the Docker image, so we have to set it from within the container
+RUN $newPath = ('C:\Redis;{0}' -f $env:PATH); \
+	Write-Host ('Updating PATH: {0}' -f $newPath); \
+# Nano Server does not have "[Environment]::SetEnvironmentVariable()"
+	setx /M PATH $newPath;
+# doing this first to share cache across versions more aggressively
+
+ENV REDIS_VERSION 3.0.504
+ENV REDIS_DOWNLOAD_URL https://github.com/MSOpenTech/redis/releases/download/win-${REDIS_VERSION}/Redis-x64-${REDIS_VERSION}.zip
+
+RUN Write-Host ('Downloading {0} ...' -f $env:REDIS_DOWNLOAD_URL); \
+	Invoke-WebRequest -Uri $env:REDIS_DOWNLOAD_URL -OutFile 'redis.zip'; \
+	\
+	Write-Host 'Expanding ...'; \
+	Expand-Archive redis.zip -DestinationPath C:\Redis; \
+	\
+	Write-Host 'Verifying install ("redis-server --version") ...'; \
+	redis-server --version; \
+	\
+	Write-Host 'Removing ...'; \
+	Remove-Item redis.zip -Force
+
+VOLUME C:\\data
+WORKDIR C:\\data
+
+EXPOSE 6379
+CMD ["redis-server.exe"]
diff --git a/redis_nanoserver/Dockerfile b/redis_nanoserver/Dockerfile
new file mode 100644
index 0000000..e4d3b06
--- /dev/null
+++ b/redis_nanoserver/Dockerfile
@@ -0,0 +1,41 @@
+FROM microsoft/nanoserver
+
+# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+# PATH isn't actually set in the Docker image, so we have to set it from within the container
+RUN $newPath = ('C:\Redis;{0}' -f $env:PATH); \
+	Write-Host ('Updating PATH: {0}' -f $newPath); \
+# Nano Server does not have "[Environment]::SetEnvironmentVariable()"
+	setx /M PATH $newPath;
+# doing this first to share cache across versions more aggressively
+
+ENV REDIS_VERSION 3.2.100
+ENV REDIS_DOWNLOAD_URL https://github.com/MSOpenTech/redis/releases/download/win-${REDIS_VERSION}/Redis-x64-${REDIS_VERSION}.zip
+
+RUN Write-Host ('Downloading {0} ...' -f $env:REDIS_DOWNLOAD_URL); \
+	Invoke-WebRequest -Uri $env:REDIS_DOWNLOAD_URL -OutFile 'redis.zip'; \
+	\
+	Write-Host 'Expanding ...'; \
+	Expand-Archive redis.zip -DestinationPath C:\Redis; \
+	\
+	Write-Host 'Verifying install ("redis-server --version") ...'; \
+	redis-server --version; \
+	\
+	Write-Host 'Removing ...'; \
+	Remove-Item redis.zip -Force
+
+# Disable Redis protected mode [1] as it is unnecessary in context
+# of Docker. Ports are not automatically exposed when running inside
+# Docker, but rather explicitely by specifying -p / -P.
+# [1] https://github.com/antirez/redis/commit/edd4d555df57dc84265fdfb4ef59a4678832f6da
+RUN (Get-Content C:\Redis\redis.windows.conf) \
+	-Replace '^(bind)\s+.*$', '$1 0.0.0.0' \
+	-Replace '^(protected-mode)\s+.*$', '$1 no' \
+	| Set-Content C:\Redis\redis.docker.conf
+
+VOLUME C:\\data
+WORKDIR C:\\data
+
+EXPOSE 6379
+CMD ["redis-server.exe", "C:\\Redis\\redis.docker.conf"]
diff --git a/redis_windowsservercore/Dockerfile b/redis_windowsservercore/Dockerfile
new file mode 100644
index 0000000..23d92e2
--- /dev/null
+++ b/redis_windowsservercore/Dockerfile
@@ -0,0 +1,41 @@
+FROM microsoft/windowsservercore
+
+# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+# PATH isn't actually set in the Docker image, so we have to set it from within the container
+RUN $newPath = ('C:\Redis;{0}' -f $env:PATH); \
+	Write-Host ('Updating PATH: {0}' -f $newPath); \
+# Nano Server does not have "[Environment]::SetEnvironmentVariable()"
+	setx /M PATH $newPath;
+# doing this first to share cache across versions more aggressively
+
+ENV REDIS_VERSION 3.2.100
+ENV REDIS_DOWNLOAD_URL https://github.com/MSOpenTech/redis/releases/download/win-${REDIS_VERSION}/Redis-x64-${REDIS_VERSION}.zip
+
+RUN Write-Host ('Downloading {0} ...' -f $env:REDIS_DOWNLOAD_URL); \
+	Invoke-WebRequest -Uri $env:REDIS_DOWNLOAD_URL -OutFile 'redis.zip'; \
+	\
+	Write-Host 'Expanding ...'; \
+	Expand-Archive redis.zip -DestinationPath C:\Redis; \
+	\
+	Write-Host 'Verifying install ("redis-server --version") ...'; \
+	redis-server --version; \
+	\
+	Write-Host 'Removing ...'; \
+	Remove-Item redis.zip -Force
+
+# Disable Redis protected mode [1] as it is unnecessary in context
+# of Docker. Ports are not automatically exposed when running inside
+# Docker, but rather explicitely by specifying -p / -P.
+# [1] https://github.com/antirez/redis/commit/edd4d555df57dc84265fdfb4ef59a4678832f6da
+RUN (Get-Content C:\Redis\redis.windows.conf) \
+	-Replace '^(bind)\s+.*$', '$1 0.0.0.0' \
+	-Replace '^(protected-mode)\s+.*$', '$1 no' \
+	| Set-Content C:\Redis\redis.docker.conf
+
+VOLUME C:\\data
+WORKDIR C:\\data
+
+EXPOSE 6379
+CMD ["redis-server.exe", "C:\\Redis\\redis.docker.conf"]
diff --git a/rocket.chat_latest/Dockerfile b/rocket.chat_latest/Dockerfile
index 9bbce13..7e2040b 100644
--- a/rocket.chat_latest/Dockerfile
+++ b/rocket.chat_latest/Dockerfile
@@ -11,7 +11,7 @@ VOLUME /app/uploads
 # gpg: key 4FD08014: public key "Rocket.Chat Buildmaster <buildmaster@rocket.chat>" imported
 RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 0E163286C20D07B9787EBE9FD7F9D0414FD08104
 
-ENV RC_VERSION 0.49.1
+ENV RC_VERSION 0.49.3
 
 WORKDIR /app
 
diff --git a/tomcat_8.5-alpine/Dockerfile b/tomcat_8.5-alpine/Dockerfile
index 847196e..fcaca51 100644
--- a/tomcat_8.5-alpine/Dockerfile
+++ b/tomcat_8.5-alpine/Dockerfile
@@ -20,7 +20,7 @@ RUN set -ex; \
 	done
 
 ENV TOMCAT_MAJOR 8
-ENV TOMCAT_VERSION 8.5.9
+ENV TOMCAT_VERSION 8.5.11
 
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
 ENV TOMCAT_TGZ_URL https://www.apache.org/dyn/closer.cgi?action=download&filename=tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz
diff --git a/tomcat_8.5/Dockerfile b/tomcat_8.5/Dockerfile
index 8eb542c..87a5ea6 100644
--- a/tomcat_8.5/Dockerfile
+++ b/tomcat_8.5/Dockerfile
@@ -44,7 +44,7 @@ RUN set -ex; \
 	done
 
 ENV TOMCAT_MAJOR 8
-ENV TOMCAT_VERSION 8.5.9
+ENV TOMCAT_VERSION 8.5.11
 
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
 ENV TOMCAT_TGZ_URL https://www.apache.org/dyn/closer.cgi?action=download&filename=tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz
diff --git a/tomcat_9-alpine/Dockerfile b/tomcat_9-alpine/Dockerfile
index 39e9d1e..98c952d 100644
--- a/tomcat_9-alpine/Dockerfile
+++ b/tomcat_9-alpine/Dockerfile
@@ -20,7 +20,7 @@ RUN set -ex; \
 	done
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.0.M15
+ENV TOMCAT_VERSION 9.0.0.M17
 
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
 ENV TOMCAT_TGZ_URL https://www.apache.org/dyn/closer.cgi?action=download&filename=tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz
diff --git a/tomcat_9/Dockerfile b/tomcat_9/Dockerfile
index 7860625..3e88b35 100644
--- a/tomcat_9/Dockerfile
+++ b/tomcat_9/Dockerfile
@@ -44,7 +44,7 @@ RUN set -ex; \
 	done
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.0.M15
+ENV TOMCAT_VERSION 9.0.0.M17
 
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
 ENV TOMCAT_TGZ_URL https://www.apache.org/dyn/closer.cgi?action=download&filename=tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz

@tianon
Copy link
Member Author

tianon commented Jan 18, 2017

(intentionally excluded the hylang diff because it's a full diff of the whole release: hylang/hy@0.11.1...0.12.0 cc @paultag)

@tianon
Copy link
Member Author

tianon commented Jan 18, 2017

Build test of #2546; 317766b (docker, hylang, mariadb, redis, rocket.chat, tomcat):

$ bashbrew build docker:1.13.0
Building bashbrew/cache:c0b3aa1c00772b9120361ffb43a77c57da65dfbca28708b4f6c39bc680d420e2 (docker:1.13.0)
Tagging docker:1.13.0
Tagging docker:1.13
Tagging docker:1
Tagging docker:latest

$ test/run.sh docker:1.13.0
testing docker:1.13.0
	'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.13.0-dind
Building bashbrew/cache:818379f0a6a10032ba9fbc16ed7afe4f5cfbb45220e725f03b2fb20ee6b59646 (docker:1.13.0-dind)
Tagging docker:1.13.0-dind
Tagging docker:1.13-dind
Tagging docker:1-dind
Tagging docker:dind

$ test/run.sh docker:1.13.0-dind
testing docker:1.13.0-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.13.0-git
Building bashbrew/cache:46de775b97fab57a01a4fc0b9a8905a5b6d9a7e753d0b440e257d1b0fb6321dc (docker:1.13.0-git)
Tagging docker:1.13.0-git
Tagging docker:1.13-git
Tagging docker:1-git
Tagging docker:git

$ test/run.sh docker:1.13.0-git
testing docker:1.13.0-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.6
Using bashbrew/cache:fff52db0412cfb96106933454351a39b34cfde78686104db4da664cb3cb616e4 (docker:1.12.6)
Tagging docker:1.12.6
Tagging docker:1.12

$ test/run.sh docker:1.12.6
testing docker:1.12.6
	'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.6-dind
Using bashbrew/cache:98fc0501b7191b940615cda01b63b6bb46d596429d37f8322a0e75b0f3972b05 (docker:1.12.6-dind)
Tagging docker:1.12.6-dind
Tagging docker:1.12-dind

$ test/run.sh docker:1.12.6-dind
testing docker:1.12.6-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.6-git
Using bashbrew/cache:001bb2b2a5562a213b6884c29abee269ef94197ce9f7f630cc4f4980b0d26e04 (docker:1.12.6-git)
Tagging docker:1.12.6-git
Tagging docker:1.12-git

$ test/run.sh docker:1.12.6-git
testing docker:1.12.6-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.6-experimental
Using bashbrew/cache:80e878494c23809845b57c611ff72844026f5467d922224f1d4c6055c1ea7368 (docker:1.12.6-experimental)
Tagging docker:1.12.6-experimental
Tagging docker:1.12-experimental

$ test/run.sh docker:1.12.6-experimental
testing docker:1.12.6-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.6-experimental-dind
Using bashbrew/cache:dd8896a1038ddebb94cc20ccabe104080cc780cc7598dabcda27fd1fefef7c76 (docker:1.12.6-experimental-dind)
Tagging docker:1.12.6-experimental-dind
Tagging docker:1.12-experimental-dind

$ test/run.sh docker:1.12.6-experimental-dind
testing docker:1.12.6-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.6-experimental-git
Using bashbrew/cache:354ad72223207943caf80fabac35cbfcda24ea62cf84db014d140da26126887a (docker:1.12.6-experimental-git)
Tagging docker:1.12.6-experimental-git
Tagging docker:1.12-experimental-git

$ test/run.sh docker:1.12.6-experimental-git
testing docker:1.12.6-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 hylang:0.12.0
Building bashbrew/cache:226c354cb987a81fab79e70d4dd0eb54550d2cb2cf379c488a848f411b55f818 (hylang:0.12.0)
Tagging hylang:0.12.0
Tagging hylang:0.12
Tagging hylang:0
Tagging hylang:latest

$ test/run.sh hylang:0.12.0
testing hylang:0.12.0
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'hylang-sh' [5/6]...passed
	'hylang-hello-world' [6/6]...passed
$ bashbrew build mariadb:10.1.21
Building bashbrew/cache:a4f46b64c48c09a9656a001c35099ab6fcead46c8a74704f395a9b5b8d56fd30 (mariadb:10.1.21)
Tagging mariadb:10.1.21
Tagging mariadb:10.1
Tagging mariadb:10
Tagging mariadb:latest

$ test/run.sh mariadb:10.1.21
testing mariadb:10.1.21
	'utc' [1/7]...passed
	'cve-2014--shellshock' [2/7]...passed
	'no-hard-coded-passwords' [3/7]...passed
	'override-cmd' [4/7]...passed
	'mysql-basics' [5/7]..........passed
	'mysql-initdb' [6/7].........passed
	'mysql-log-bin' [7/7]..........passed


$ bashbrew build mariadb:10.0.29
Using bashbrew/cache:abd31f16d8f315eeac4da905dd39c3b49f75c6ec0b6140e5ade1b716bf216bf2 (mariadb:10.0.29)
Tagging mariadb:10.0.29
Tagging mariadb:10.0

$ test/run.sh mariadb:10.0.29
testing mariadb:10.0.29
	'utc' [1/7]...passed
	'cve-2014--shellshock' [2/7]...passed
	'no-hard-coded-passwords' [3/7]...passed
	'override-cmd' [4/7]...passed
	'mysql-basics' [5/7]........passed
	'mysql-initdb' [6/7]........passed
	'mysql-log-bin' [7/7].......passed


$ bashbrew build mariadb:5.5.54
Using bashbrew/cache:5e45e609deb8494adda93c67d74c55ada97d053eeee89bd077656d2ec79d2835 (mariadb:5.5.54)
Tagging mariadb:5.5.54
Tagging mariadb:5.5
Tagging mariadb:5

$ test/run.sh mariadb:5.5.54
testing mariadb:5.5.54
	'utc' [1/7]...passed
	'cve-2014--shellshock' [2/7]...passed
	'no-hard-coded-passwords' [3/7]...passed
	'override-cmd' [4/7]...passed
	'mysql-basics' [5/7]......passed
	'mysql-initdb' [6/7]......passed
	'mysql-log-bin' [7/7]......passed
$ bashbrew build redis:3.0.7
Using bashbrew/cache:81b36ca6ae9d00062285c362a0b6bb7522e3c863c3c11d23cda87bf60ee8ee91 (redis:3.0.7)
Tagging redis:3.0.7
Tagging redis:3.0

$ test/run.sh redis:3.0.7
testing redis:3.0.7
	'utc' [1/7]...passed
	'cve-2014--shellshock' [2/7]...passed
	'no-hard-coded-passwords' [3/7]...passed
	'override-cmd' [4/7]...passed
	'redis-basics' [5/7]...passed
	'redis-basics-config' [6/7]...passed
	'redis-basics-persistent' [7/7]...passed


$ bashbrew build redis:3.0.7-32bit
Using bashbrew/cache:0c4588f35b15ff21d58e41499325640c1d50670fa3b613587924ceadde07f6e0 (redis:3.0.7-32bit)
Tagging redis:3.0.7-32bit
Tagging redis:3.0-32bit

$ test/run.sh redis:3.0.7-32bit
testing redis:3.0.7-32bit
	'utc' [1/7]...passed
	'cve-2014--shellshock' [2/7]...passed
	'no-hard-coded-passwords' [3/7]...passed
	'override-cmd' [4/7]...passed
	'redis-basics' [5/7]...passed
	'redis-basics-config' [6/7]...passed
	'redis-basics-persistent' [7/7]...passed


$ bashbrew build redis:3.0.7-alpine
Using bashbrew/cache:c481b83b8e590dac4778c6e1733c59e39ec733154883aab79d3eee0fb1a65899 (redis:3.0.7-alpine)
Tagging redis:3.0.7-alpine
Tagging redis:3.0-alpine

$ test/run.sh redis:3.0.7-alpine
testing redis:3.0.7-alpine
	'utc' [1/7]...passed
	'cve-2014--shellshock' [2/7]...passed
	'no-hard-coded-passwords' [3/7]...passed
	'override-cmd' [4/7]...passed
	'redis-basics' [5/7]...passed
	'redis-basics-config' [6/7]...passed
	'redis-basics-persistent' [7/7]...passed


$ bashbrew build redis:3.0.7-windowsservercore
skipping "redis:3.0.7-windowsservercore" (due to unsatisfactory constraints ["windowsservercore"])

$ test/run.sh redis:3.0.7-windowsservercore
testing redis:3.0.7-windowsservercore
	image does not exist!


$ bashbrew build redis:3.0.7-nanoserver
skipping "redis:3.0.7-nanoserver" (due to unsatisfactory constraints ["nanoserver"])

$ test/run.sh redis:3.0.7-nanoserver
testing redis:3.0.7-nanoserver
	image does not exist!


$ bashbrew build redis:3.2.6
Using bashbrew/cache:5b45378e6008def8371f150243ee79a9f16873b26d4b8c86ffd03fb36e5991f0 (redis:3.2.6)
Tagging redis:3.2.6
Tagging redis:3.2
Tagging redis:3
Tagging redis:latest

$ test/run.sh redis:3.2.6
testing redis:3.2.6
	'utc' [1/7]...passed
	'cve-2014--shellshock' [2/7]...passed
	'no-hard-coded-passwords' [3/7]...passed
	'override-cmd' [4/7]...passed
	'redis-basics' [5/7]...passed
	'redis-basics-config' [6/7]...passed
	'redis-basics-persistent' [7/7]...passed


$ bashbrew build redis:3.2.6-32bit
Using bashbrew/cache:c68848ffd432e9737d133bcbf20a69902c8354c107f31477317daea7c799918f (redis:3.2.6-32bit)
Tagging redis:3.2.6-32bit
Tagging redis:3.2-32bit
Tagging redis:3-32bit
Tagging redis:32bit

$ test/run.sh redis:3.2.6-32bit
testing redis:3.2.6-32bit
	'utc' [1/7]...passed
	'cve-2014--shellshock' [2/7]...passed
	'no-hard-coded-passwords' [3/7]...passed
	'override-cmd' [4/7]...passed
	'redis-basics' [5/7]...passed
	'redis-basics-config' [6/7]...passed
	'redis-basics-persistent' [7/7]...passed


$ bashbrew build redis:3.2.6-alpine
Using bashbrew/cache:1d9e2714e10d331a8516422fc8c4d4d1b9ebf1173709cc4b20f5bb5a43fa3925 (redis:3.2.6-alpine)
Tagging redis:3.2.6-alpine
Tagging redis:3.2-alpine
Tagging redis:3-alpine
Tagging redis:alpine

$ test/run.sh redis:3.2.6-alpine
testing redis:3.2.6-alpine
	'utc' [1/7]...passed
	'cve-2014--shellshock' [2/7]...passed
	'no-hard-coded-passwords' [3/7]...passed
	'override-cmd' [4/7]...passed
	'redis-basics' [5/7]...passed
	'redis-basics-config' [6/7]...passed
	'redis-basics-persistent' [7/7]...passed


$ bashbrew build redis:3.2.6-windowsservercore
skipping "redis:3.2.6-windowsservercore" (due to unsatisfactory constraints ["windowsservercore"])

$ test/run.sh redis:3.2.6-windowsservercore
testing redis:3.2.6-windowsservercore
	image does not exist!


$ bashbrew build redis:3.2.6-nanoserver
skipping "redis:3.2.6-nanoserver" (due to unsatisfactory constraints ["nanoserver"])

$ test/run.sh redis:3.2.6-nanoserver
testing redis:3.2.6-nanoserver
	image does not exist!
$ bashbrew build rocket.chat:0.49.3
Building bashbrew/cache:aed1cb6f963f2c09c7aff3fd45a1f234d61f5787a7e2b780a6366b3970f8249a (rocket.chat:0.49.3)
Tagging rocket.chat:0.49.3
Tagging rocket.chat:0.49
Tagging rocket.chat:0
Tagging rocket.chat:latest

$ test/run.sh rocket.chat:0.49.3
testing rocket.chat:0.49.3
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed
$ bashbrew build tomcat:6.0.48-jre7
Using bashbrew/cache:152e8888e2d283374530fc0e052b119abeaecaefd62973488282e4eea0fed354 (tomcat:6.0.48-jre7)
Tagging tomcat:6.0.48-jre7
Tagging tomcat:6.0-jre7
Tagging tomcat:6-jre7
Tagging tomcat:6.0.48
Tagging tomcat:6.0
Tagging tomcat:6

$ test/run.sh tomcat:6.0.48-jre7
testing tomcat:6.0.48-jre7
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'tomcat-hello-world' [5/5]....passed


$ bashbrew build tomcat:6.0.48-jre8
Using bashbrew/cache:b8389dbd0725b2aa092597bb3b07bb84cb89d65abab7287db7a4094cbe38f7f4 (tomcat:6.0.48-jre8)
Tagging tomcat:6.0.48-jre8
Tagging tomcat:6.0-jre8
Tagging tomcat:6-jre8

$ test/run.sh tomcat:6.0.48-jre8
testing tomcat:6.0.48-jre8
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'tomcat-hello-world' [5/5]....passed


$ bashbrew build tomcat:7.0.73-jre7
Using bashbrew/cache:4f5979ccb2e88ad5d74f7eb83c8fa34cae43358a649deb1d345c5ccecb51965a (tomcat:7.0.73-jre7)
Tagging tomcat:7.0.73-jre7
Tagging tomcat:7.0-jre7
Tagging tomcat:7-jre7
Tagging tomcat:7.0.73
Tagging tomcat:7.0
Tagging tomcat:7

$ test/run.sh tomcat:7.0.73-jre7
testing tomcat:7.0.73-jre7
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'tomcat-hello-world' [5/5]....passed


$ bashbrew build tomcat:7.0.73-jre7-alpine
Using bashbrew/cache:affe206400abc8320c37e6e9bfcbcc1d5b7700d3e52f4c2479b2ef797d51b28e (tomcat:7.0.73-jre7-alpine)
Tagging tomcat:7.0.73-jre7-alpine
Tagging tomcat:7.0-jre7-alpine
Tagging tomcat:7-jre7-alpine
Tagging tomcat:7.0.73-alpine
Tagging tomcat:7.0-alpine
Tagging tomcat:7-alpine

$ test/run.sh tomcat:7.0.73-jre7-alpine
testing tomcat:7.0.73-jre7-alpine
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'tomcat-hello-world' [5/5]....passed


$ bashbrew build tomcat:7.0.73-jre8
Using bashbrew/cache:8bac459e379a647cab84be6cc78f26c96d5c650e2b480fc347ef75c1b243eef1 (tomcat:7.0.73-jre8)
Tagging tomcat:7.0.73-jre8
Tagging tomcat:7.0-jre8
Tagging tomcat:7-jre8

$ test/run.sh tomcat:7.0.73-jre8
testing tomcat:7.0.73-jre8
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'tomcat-hello-world' [5/5]....passed


$ bashbrew build tomcat:7.0.73-jre8-alpine
Using bashbrew/cache:7c9ff433bc3e6529d6580e8dd78ce6204aa9b686ae64dbaba8f10d88daba1355 (tomcat:7.0.73-jre8-alpine)
Tagging tomcat:7.0.73-jre8-alpine
Tagging tomcat:7.0-jre8-alpine
Tagging tomcat:7-jre8-alpine

$ test/run.sh tomcat:7.0.73-jre8-alpine
testing tomcat:7.0.73-jre8-alpine
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'tomcat-hello-world' [5/5]....passed


$ bashbrew build tomcat:8.0.39-jre7
Using bashbrew/cache:052416f57ea81743bb308c6df6c6e53e2664f1cdd5e820cf28a891454be07686 (tomcat:8.0.39-jre7)
Tagging tomcat:8.0.39-jre7
Tagging tomcat:8.0-jre7
Tagging tomcat:8-jre7
Tagging tomcat:jre7
Tagging tomcat:8.0.39
Tagging tomcat:8.0
Tagging tomcat:8
Tagging tomcat:latest

$ test/run.sh tomcat:8.0.39-jre7
testing tomcat:8.0.39-jre7
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'tomcat-hello-world' [5/5]....passed


$ bashbrew build tomcat:8.0.39-jre7-alpine
Using bashbrew/cache:adaf12c6fd94812c122a80b4dd9917d8f02fce7f2edb1d32c78478979fea3a31 (tomcat:8.0.39-jre7-alpine)
Tagging tomcat:8.0.39-jre7-alpine
Tagging tomcat:8.0-jre7-alpine
Tagging tomcat:8-jre7-alpine
Tagging tomcat:jre7-alpine
Tagging tomcat:8.0.39-alpine
Tagging tomcat:8.0-alpine
Tagging tomcat:8-alpine
Tagging tomcat:alpine

$ test/run.sh tomcat:8.0.39-jre7-alpine
testing tomcat:8.0.39-jre7-alpine
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'tomcat-hello-world' [5/5]....passed


$ bashbrew build tomcat:8.0.39-jre8
Using bashbrew/cache:9dfbc3f0636874f118aca2522b7218df7d99da894aaf7190cf06695c78bfd908 (tomcat:8.0.39-jre8)
Tagging tomcat:8.0.39-jre8
Tagging tomcat:8.0-jre8
Tagging tomcat:8-jre8
Tagging tomcat:jre8

$ test/run.sh tomcat:8.0.39-jre8
testing tomcat:8.0.39-jre8
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'tomcat-hello-world' [5/5]....passed


$ bashbrew build tomcat:8.0.39-jre8-alpine
Using bashbrew/cache:e5c5e2757ac13f8b1f1a79feabf05be3c0689d0f178eddd063b2aeadcca7a0f9 (tomcat:8.0.39-jre8-alpine)
Tagging tomcat:8.0.39-jre8-alpine
Tagging tomcat:8.0-jre8-alpine
Tagging tomcat:8-jre8-alpine
Tagging tomcat:jre8-alpine

$ test/run.sh tomcat:8.0.39-jre8-alpine
testing tomcat:8.0.39-jre8-alpine
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'tomcat-hello-world' [5/5]....passed


$ bashbrew build tomcat:8.5.11-jre8
Building bashbrew/cache:a3a42781ead47f5f0565fcc9ad52488d7c41656426a78d3a444e8b856bea6f8e (tomcat:8.5.11-jre8)
Tagging tomcat:8.5.11-jre8
Tagging tomcat:8.5-jre8
Tagging tomcat:8.5.11
Tagging tomcat:8.5

$ test/run.sh tomcat:8.5.11-jre8
testing tomcat:8.5.11-jre8
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'tomcat-hello-world' [5/5]...passed


$ bashbrew build tomcat:8.5.11-jre8-alpine
Building bashbrew/cache:795e7197dcd2b5fd23d9c41926d469e8eec8abbb466dff6bb21d662f88768931 (tomcat:8.5.11-jre8-alpine)
Tagging tomcat:8.5.11-jre8-alpine
Tagging tomcat:8.5-jre8-alpine
Tagging tomcat:8.5.11-alpine
Tagging tomcat:8.5-alpine

$ test/run.sh tomcat:8.5.11-jre8-alpine
testing tomcat:8.5.11-jre8-alpine
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'tomcat-hello-world' [5/5]....passed


$ bashbrew build tomcat:9.0.0.M17-jre8
Building bashbrew/cache:076406c33ab578d85cb26aced6b2702ab5a5f3ab7619c5a95293ebcd05a80c2c (tomcat:9.0.0.M17-jre8)
Tagging tomcat:9.0.0.M17-jre8
Tagging tomcat:9.0.0-jre8
Tagging tomcat:9.0-jre8
Tagging tomcat:9-jre8
Tagging tomcat:9.0.0.M17
Tagging tomcat:9.0.0
Tagging tomcat:9.0
Tagging tomcat:9

$ test/run.sh tomcat:9.0.0.M17-jre8
testing tomcat:9.0.0.M17-jre8
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'tomcat-hello-world' [5/5]....passed


$ bashbrew build tomcat:9.0.0.M17-jre8-alpine
Building bashbrew/cache:16be2050be7d1dc84e71cb1ee8998810be0b603fc2619ef8dfebaae32bb5382a (tomcat:9.0.0.M17-jre8-alpine)
Tagging tomcat:9.0.0.M17-jre8-alpine
Tagging tomcat:9.0.0-jre8-alpine
Tagging tomcat:9.0-jre8-alpine
Tagging tomcat:9-jre8-alpine
Tagging tomcat:9.0.0.M17-alpine
Tagging tomcat:9.0.0-alpine
Tagging tomcat:9.0-alpine
Tagging tomcat:9-alpine

$ test/run.sh tomcat:9.0.0.M17-jre8-alpine
testing tomcat:9.0.0.M17-jre8-alpine
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'tomcat-hello-world' [5/5]....passed

The following images failed at least one test:

  • redis:
    • redis:3.0.7-windowsservercore
    • redis:3.0.7-nanoserver
    • redis:3.2.6-windowsservercore
    • redis:3.2.6-nanoserver

@tianon
Copy link
Member Author

tianon commented Jan 18, 2017

$ bashbrew build 2>/dev/null https://github.com/infosiftr/stackbrew/raw/update-docker-library/library/redis
Building bashbrew/cache:6720b06c8fe5f173288ec03f30fa1900fe077ec028379ea5a60de0f3258be80f (redis:3.0.7-windowsservercore)
Tagging redis:3.0.7-windowsservercore
Tagging redis:3.0-windowsservercore
Building bashbrew/cache:daf5252f3e4ef8df6e1c8c8f91fcfab2a5c3cdd235b4f3028bee1526b3db1207 (redis:3.0.7-nanoserver)
Tagging redis:3.0.7-nanoserver
Tagging redis:3.0-nanoserver
Building bashbrew/cache:816a03a5cd28ee39020dbd877af4349855b37abf9be3dd64b1f5b42c129d710e (redis:3.2.6-windowsservercore)
Tagging redis:3.2.6-windowsservercore
Tagging redis:3.2-windowsservercore
Tagging redis:3-windowsservercore
Tagging redis:windowsservercore
Building bashbrew/cache:5262a67cfbf49e03204964a8981aea87a07c8e000f5ecf4fd924aad3f1286953 (redis:3.2.6-nanoserver)
Tagging redis:3.2.6-nanoserver
Tagging redis:3.2-nanoserver
Tagging redis:3-nanoserver
Tagging redis:nanoserver

@daghack
Copy link
Contributor

daghack commented Jan 18, 2017

LGTM

@daghack daghack merged commit f55fdba into docker-library:master Jan 18, 2017
@paultag
Copy link
Contributor

paultag commented Jan 18, 2017

:D

@tianon tianon deleted the update-docker-library branch January 18, 2017 22:50
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.

4 participants