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

Merged
merged 1 commit into from
Apr 11, 2017

Conversation

tianon
Copy link
Member

@tianon tianon commented Apr 11, 2017

- `mysql`: 5.7.18, 5.6.36, 5.5.55, 8.0.1
- `rabbitmq`: adjust `vm_memory_high_watermark` handling to fix several edge cases (docker-library/rabbitmq#149)
- `rocket.chat`: revert to 0.54.2, skipping RCs for the official image (RocketChat/Docker.Official.Image#31)
- `tomcat`: update `8` and `latest` to be `8.5` (docker-library/tomcat#67)
@tianon
Copy link
Member Author

tianon commented Apr 11, 2017

Diff:

diff --git a/_bashbrew-list b/_bashbrew-list
index f4ee136..89a5983 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,12 +2,12 @@ mysql:5
 mysql:5.5
 mysql:5.5.55
 mysql:5.6
-mysql:5.6.35
+mysql:5.6.36
 mysql:5.7
-mysql:5.7.17
+mysql:5.7.18
 mysql:8
 mysql:8.0
-mysql:8.0.0
+mysql:8.0.1
 mysql:latest
 rabbitmq:3
 rabbitmq:3-alpine
@@ -25,9 +25,9 @@ rabbitmq:alpine
 rabbitmq:latest
 rabbitmq:management
 rabbitmq:management-alpine
-rocket.chat:0.55
-rocket.chat:0.55.0-rc
-rocket.chat:0.55.0-rc.1
+rocket.chat:0
+rocket.chat:0.54
+rocket.chat:0.54.2
 rocket.chat:latest
 tomcat:6
 tomcat:6-jre7
@@ -58,8 +58,6 @@ tomcat:7.0.77-jre8
 tomcat:7.0.77-jre8-alpine
 tomcat:8
 tomcat:8-alpine
-tomcat:8-jre7
-tomcat:8-jre7-alpine
 tomcat:8-jre8
 tomcat:8-jre8-alpine
 tomcat:8.0
@@ -99,8 +97,6 @@ tomcat:9.0.0.M19-alpine
 tomcat:9.0.0.M19-jre8
 tomcat:9.0.0.M19-jre8-alpine
 tomcat:alpine
-tomcat:jre7
-tomcat:jre7-alpine
 tomcat:jre8
 tomcat:jre8-alpine
 tomcat:latest
diff --git a/mysql_5.6/Dockerfile b/mysql_5.6/Dockerfile
index 34cb0e1..1288265 100644
--- a/mysql_5.6/Dockerfile
+++ b/mysql_5.6/Dockerfile
@@ -36,7 +36,7 @@ RUN set -ex; \
 	apt-key list > /dev/null
 
 ENV MYSQL_MAJOR 5.6
-ENV MYSQL_VERSION 5.6.35-1debian8
+ENV MYSQL_VERSION 5.6.36-1debian8
 
 RUN echo "deb http://repo.mysql.com/apt/debian/ jessie mysql-${MYSQL_MAJOR}" > /etc/apt/sources.list.d/mysql.list
 
diff --git a/mysql_8/Dockerfile b/mysql_8/Dockerfile
index 2cba5af..b7a601a 100644
--- a/mysql_8/Dockerfile
+++ b/mysql_8/Dockerfile
@@ -42,7 +42,7 @@ RUN set -ex; \
 	apt-key list > /dev/null
 
 ENV MYSQL_MAJOR 8.0
-ENV MYSQL_VERSION 8.0.0-dmr-1debian8
+ENV MYSQL_VERSION 8.0.1-dmr-1debian8
 
 RUN echo "deb http://repo.mysql.com/apt/debian/ jessie mysql-${MYSQL_MAJOR}" > /etc/apt/sources.list.d/mysql.list
 
diff --git a/mysql_latest/Dockerfile b/mysql_latest/Dockerfile
index 2f19033..b2cb13b 100644
--- a/mysql_latest/Dockerfile
+++ b/mysql_latest/Dockerfile
@@ -42,7 +42,7 @@ RUN set -ex; \
 	apt-key list > /dev/null
 
 ENV MYSQL_MAJOR 5.7
-ENV MYSQL_VERSION 5.7.17-1debian8
+ENV MYSQL_VERSION 5.7.18-1debian8
 
 RUN echo "deb http://repo.mysql.com/apt/debian/ jessie mysql-${MYSQL_MAJOR}" > /etc/apt/sources.list.d/mysql.list
 
diff --git a/rabbitmq_alpine/docker-entrypoint.sh b/rabbitmq_alpine/docker-entrypoint.sh
index e06bdb5..b13a184 100755
--- a/rabbitmq_alpine/docker-entrypoint.sh
+++ b/rabbitmq_alpine/docker-entrypoint.sh
@@ -253,17 +253,23 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then
 	)
 
 	# determine whether to set "vm_memory_high_watermark" (based on cgroups)
-	if [ -r /sys/fs/cgroup/memory/memory.limit_in_bytes ] && [ -r /proc/meminfo ]; then
-		memLimitB="$(< /sys/fs/cgroup/memory/memory.limit_in_bytes)"
-		memLimitKb="$(( memLimitB / 1024 ))"
-
+	memTotalKb=
+	if [ -r /proc/meminfo ]; then
 		memTotalKb="$(awk -F ':? +' '$1 == "MemTotal" { print $2; exit }' /proc/meminfo)"
-
-		if [ "$memLimitKb" -gt "$memTotalKb" ]; then
-			memLimitB=
-			memLimitKb=
-		fi
-
+	fi
+	memLimitB=
+	if [ -r /sys/fs/cgroup/memory/memory.limit_in_bytes ]; then
+		# "18446744073709551615" is a valid value for "memory.limit_in_bytes", which is too big for Bash math to handle
+		# "$(( 18446744073709551615 / 1024 ))" = 0; "$(( 18446744073709551615 * 40 / 100 ))" = 0
+		memLimitB="$(awk -v totKb="$memTotalKb" '{
+			limB = $0;
+			limKb = limB / 1024;
+			if (!totKb || limKb < totKb) {
+				printf "%.0f\n", limB;
+			}
+		}' /sys/fs/cgroup/memory/memory.limit_in_bytes)"
+	fi
+	if [ -n "$memTotalKb" ] || [ -n "$memLimitB" ]; then
 		# https://github.com/docker-library/rabbitmq/pull/105#issuecomment-242165822
 		vmMemoryHighWatermark=
 		if [ "${RABBITMQ_VM_MEMORY_HIGH_WATERMARK:-}" ]; then
@@ -302,7 +308,7 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then
 			)"
 		elif [ -n "$memLimitB" ]; then
 			# if there is a cgroup limit, default to 40% of _that_ (as recommended by upstream)
-			vmMemoryHighWatermark="{ absolute, $(( $memLimitB * 40 / 100 )) }"
+			vmMemoryHighWatermark="{ absolute, $(awk -v lim="$memLimitB" 'BEGIN { printf "%.0f\n", lim * 0.4; exit }') }"
 			# otherwise let the default behavior win (40% of the total available)
 		fi
 		if [ "$vmMemoryHighWatermark" ]; then
@@ -310,10 +316,8 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then
 			rabbitConfig+=( "{ vm_memory_high_watermark, $vmMemoryHighWatermark }" )
 		fi
 	elif [ "${RABBITMQ_VM_MEMORY_HIGH_WATERMARK:-}" ]; then
-		echo >&2 'warning: RABBITMQ_VM_MEMORY_HIGH_WATERMARK was specified, but one of the following is not readable:'
-		echo >&2 '  - /sys/fs/cgroup/memory/memory.limit_in_bytes'
-		echo >&2 '  - /proc/meminfo'
-		echo >&2 '(so "vm_memory_high_watermark" will not be set)'
+		echo >&2 'warning: RABBITMQ_VM_MEMORY_HIGH_WATERMARK was specified, but current system memory or cgroup memory limit cannot be determined'
+		echo >&2 '  (so "vm_memory_high_watermark" will not be set)'
 	fi
 
 	if [ "$haveSslConfig" ]; then
diff --git a/rabbitmq_latest/docker-entrypoint.sh b/rabbitmq_latest/docker-entrypoint.sh
index 2607fdd..ad07d8e 100755
--- a/rabbitmq_latest/docker-entrypoint.sh
+++ b/rabbitmq_latest/docker-entrypoint.sh
@@ -253,17 +253,23 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then
 	)
 
 	# determine whether to set "vm_memory_high_watermark" (based on cgroups)
-	if [ -r /sys/fs/cgroup/memory/memory.limit_in_bytes ] && [ -r /proc/meminfo ]; then
-		memLimitB="$(< /sys/fs/cgroup/memory/memory.limit_in_bytes)"
-		memLimitKb="$(( memLimitB / 1024 ))"
-
+	memTotalKb=
+	if [ -r /proc/meminfo ]; then
 		memTotalKb="$(awk -F ':? +' '$1 == "MemTotal" { print $2; exit }' /proc/meminfo)"
-
-		if [ "$memLimitKb" -gt "$memTotalKb" ]; then
-			memLimitB=
-			memLimitKb=
-		fi
-
+	fi
+	memLimitB=
+	if [ -r /sys/fs/cgroup/memory/memory.limit_in_bytes ]; then
+		# "18446744073709551615" is a valid value for "memory.limit_in_bytes", which is too big for Bash math to handle
+		# "$(( 18446744073709551615 / 1024 ))" = 0; "$(( 18446744073709551615 * 40 / 100 ))" = 0
+		memLimitB="$(awk -v totKb="$memTotalKb" '{
+			limB = $0;
+			limKb = limB / 1024;
+			if (!totKb || limKb < totKb) {
+				printf "%.0f\n", limB;
+			}
+		}' /sys/fs/cgroup/memory/memory.limit_in_bytes)"
+	fi
+	if [ -n "$memTotalKb" ] || [ -n "$memLimitB" ]; then
 		# https://github.com/docker-library/rabbitmq/pull/105#issuecomment-242165822
 		vmMemoryHighWatermark=
 		if [ "${RABBITMQ_VM_MEMORY_HIGH_WATERMARK:-}" ]; then
@@ -302,7 +308,7 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then
 			)"
 		elif [ -n "$memLimitB" ]; then
 			# if there is a cgroup limit, default to 40% of _that_ (as recommended by upstream)
-			vmMemoryHighWatermark="{ absolute, $(( $memLimitB * 40 / 100 )) }"
+			vmMemoryHighWatermark="{ absolute, $(awk -v lim="$memLimitB" 'BEGIN { printf "%.0f\n", lim * 0.4; exit }') }"
 			# otherwise let the default behavior win (40% of the total available)
 		fi
 		if [ "$vmMemoryHighWatermark" ]; then
@@ -310,10 +316,8 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then
 			rabbitConfig+=( "{ vm_memory_high_watermark, $vmMemoryHighWatermark }" )
 		fi
 	elif [ "${RABBITMQ_VM_MEMORY_HIGH_WATERMARK:-}" ]; then
-		echo >&2 'warning: RABBITMQ_VM_MEMORY_HIGH_WATERMARK was specified, but one of the following is not readable:'
-		echo >&2 '  - /sys/fs/cgroup/memory/memory.limit_in_bytes'
-		echo >&2 '  - /proc/meminfo'
-		echo >&2 '(so "vm_memory_high_watermark" will not be set)'
+		echo >&2 'warning: RABBITMQ_VM_MEMORY_HIGH_WATERMARK was specified, but current system memory or cgroup memory limit cannot be determined'
+		echo >&2 '  (so "vm_memory_high_watermark" will not be set)'
 	fi
 
 	if [ "$haveSslConfig" ]; then
diff --git a/rocket.chat_latest/Dockerfile b/rocket.chat_latest/Dockerfile
index fb28d52..18581c8 100644
--- a/rocket.chat_latest/Dockerfile
+++ b/rocket.chat_latest/Dockerfile
@@ -13,7 +13,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.55.0-rc.1
+ENV RC_VERSION 0.54.2
 
 WORKDIR /app
 
diff --git a/tomcat_alpine/Dockerfile b/tomcat_8.0-alpine/Dockerfile
similarity index 100%
copy from tomcat_alpine/Dockerfile
copy to tomcat_8.0-alpine/Dockerfile
diff --git a/tomcat_jre8-alpine/Dockerfile b/tomcat_8.0-jre8-alpine/Dockerfile
similarity index 100%
rename from tomcat_jre8-alpine/Dockerfile
rename to tomcat_8.0-jre8-alpine/Dockerfile
diff --git a/tomcat_jre8/Dockerfile b/tomcat_8.0-jre8/Dockerfile
similarity index 100%
rename from tomcat_jre8/Dockerfile
rename to tomcat_8.0-jre8/Dockerfile
diff --git a/tomcat_latest/Dockerfile b/tomcat_8.0/Dockerfile
similarity index 100%
copy from tomcat_latest/Dockerfile
copy to tomcat_8.0/Dockerfile
diff --git a/tomcat_8.5-alpine/Dockerfile b/tomcat_8.5-alpine/Dockerfile
deleted file mode 100644
index b4c3460..0000000
diff --git a/tomcat_8.5/Dockerfile b/tomcat_8.5/Dockerfile
deleted file mode 100644
index 898fecc..0000000
diff --git a/tomcat_alpine/Dockerfile b/tomcat_alpine/Dockerfile
index 405181a..b4c3460 100644
--- a/tomcat_alpine/Dockerfile
+++ b/tomcat_alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:7-jre-alpine
+FROM openjdk:8-jre-alpine
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -20,7 +20,7 @@ RUN set -ex; \
 	done
 
 ENV TOMCAT_MAJOR 8
-ENV TOMCAT_VERSION 8.0.43
+ENV TOMCAT_VERSION 8.5.13
 
 # 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_latest/Dockerfile b/tomcat_latest/Dockerfile
index dac2d31..898fecc 100644
--- a/tomcat_latest/Dockerfile
+++ b/tomcat_latest/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:7-jre
+FROM openjdk:8-jre
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -44,7 +44,7 @@ RUN set -ex; \
 	done
 
 ENV TOMCAT_MAJOR 8
-ENV TOMCAT_VERSION 8.0.43
+ENV TOMCAT_VERSION 8.5.13
 
 # 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

@yosifkit
Copy link
Member

Build test of #2847; 26e1d60 (mysql, rabbitmq, rocket.chat, tomcat):

$ bashbrew build mysql:8.0.1
Using bashbrew/cache:715afe73c83b25e19303340749e22ae973d286cfaac6354a83f5a24f2b49bfb6 (mysql:8.0.1)
Tagging mysql:8.0.1
Tagging mysql:8.0
Tagging mysql:8

$ test/run.sh mysql:8.0.1
testing mysql:8.0.1
	'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 mysql:5.7.18
Using bashbrew/cache:f4ff22193a2c22080e7638826c286ac7365c26db26620e28a14e506aa097a75c (mysql:5.7.18)
Tagging mysql:5.7.18
Tagging mysql:5.7
Tagging mysql:5
Tagging mysql:latest

$ test/run.sh mysql:5.7.18
testing mysql:5.7.18
	'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 mysql:5.6.36
Using bashbrew/cache:d8ec7d6e8eb996259f0a1e95625816af6ad79a74482329ac51418ddc788350c8 (mysql:5.6.36)
Tagging mysql:5.6.36
Tagging mysql:5.6

$ test/run.sh mysql:5.6.36
testing mysql:5.6.36
	'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 mysql:5.5.55
Using bashbrew/cache:5538553fee45f5a73d2a89cd1be00181b9fd6373da84ecbc7c68b6aa8ea90047 (mysql:5.5.55)
Tagging mysql:5.5.55
Tagging mysql:5.5

$ test/run.sh mysql:5.5.55
testing mysql:5.5.55
	'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 rabbitmq:3.6.9
Using bashbrew/cache:9374bc55809b7bcf3ffe863bb550c1a1c33a516e4da49954668e864ff73fde61 (rabbitmq:3.6.9)
Tagging rabbitmq:3.6.9
Tagging rabbitmq:3.6
Tagging rabbitmq:3
Tagging rabbitmq:latest

$ test/run.sh rabbitmq:3.6.9
testing rabbitmq:3.6.9
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build rabbitmq:3.6.9-management
Using bashbrew/cache:eab49c92e02fef8e13660fd03379b44a9ade3842e352306ef7702b3b902ee049 (rabbitmq:3.6.9-management)
Tagging rabbitmq:3.6.9-management
Tagging rabbitmq:3.6-management
Tagging rabbitmq:3-management
Tagging rabbitmq:management

$ test/run.sh rabbitmq:3.6.9-management
testing rabbitmq:3.6.9-management
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build rabbitmq:3.6.9-alpine
Using bashbrew/cache:60977b9c713fdca0c1c7a2b9cdb3f4b2d3abe5835971d5065c406f21094b5c71 (rabbitmq:3.6.9-alpine)
Tagging rabbitmq:3.6.9-alpine
Tagging rabbitmq:3.6-alpine
Tagging rabbitmq:3-alpine
Tagging rabbitmq:alpine

$ test/run.sh rabbitmq:3.6.9-alpine
testing rabbitmq:3.6.9-alpine
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build rabbitmq:3.6.9-management-alpine
Using bashbrew/cache:3de5e70c9ddf5232f655d7c3206fdb2d1b8bd44e11dc2909ce64a7bbc8072b92 (rabbitmq:3.6.9-management-alpine)
Tagging rabbitmq:3.6.9-management-alpine
Tagging rabbitmq:3.6-management-alpine
Tagging rabbitmq:3-management-alpine
Tagging rabbitmq:management-alpine

$ test/run.sh rabbitmq:3.6.9-management-alpine
testing rabbitmq:3.6.9-management-alpine
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed
$ bashbrew build rocket.chat:0.54.2
Using bashbrew/cache:ce069d1d9ec801344e3df07e125dc4f8ead8daa664b9b8f26415c65d786f4cee (rocket.chat:0.54.2)
Tagging rocket.chat:0.54.2
Tagging rocket.chat:0.54
Tagging rocket.chat:0
Tagging rocket.chat:latest

$ test/run.sh rocket.chat:0.54.2
testing rocket.chat:0.54.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 tomcat:6.0.53-jre7
Using bashbrew/cache:5355139c75a61d39c88674ab14a384548cbbdd9de9b7a707d59488de895ef47c (tomcat:6.0.53-jre7)
Tagging tomcat:6.0.53-jre7
Tagging tomcat:6.0-jre7
Tagging tomcat:6-jre7
Tagging tomcat:6.0.53
Tagging tomcat:6.0
Tagging tomcat:6

$ test/run.sh tomcat:6.0.53-jre7
testing tomcat:6.0.53-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.53-jre8
Using bashbrew/cache:8ed83db9cd9ccec722a9124cc8d22fd871884b8547f6fa66c0968678372ecac4 (tomcat:6.0.53-jre8)
Tagging tomcat:6.0.53-jre8
Tagging tomcat:6.0-jre8
Tagging tomcat:6-jre8

$ test/run.sh tomcat:6.0.53-jre8
testing tomcat:6.0.53-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.77-jre7
Using bashbrew/cache:b82e301eab4af3f23ee796d9c087d63d140ecdcba9a9f48f38b3f3426448201e (tomcat:7.0.77-jre7)
Tagging tomcat:7.0.77-jre7
Tagging tomcat:7.0-jre7
Tagging tomcat:7-jre7
Tagging tomcat:7.0.77
Tagging tomcat:7.0
Tagging tomcat:7

$ test/run.sh tomcat:7.0.77-jre7
testing tomcat:7.0.77-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.77-jre7-alpine
Using bashbrew/cache:25966c79c9d60338ea389749259d6ce142c858eb834e59332037687e572a2e95 (tomcat:7.0.77-jre7-alpine)
Tagging tomcat:7.0.77-jre7-alpine
Tagging tomcat:7.0-jre7-alpine
Tagging tomcat:7-jre7-alpine
Tagging tomcat:7.0.77-alpine
Tagging tomcat:7.0-alpine
Tagging tomcat:7-alpine

$ test/run.sh tomcat:7.0.77-jre7-alpine
testing tomcat:7.0.77-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.77-jre8
Using bashbrew/cache:fa0818e203359c496f2f03f5be32068180a4de13057430fd043cd9143d090eb5 (tomcat:7.0.77-jre8)
Tagging tomcat:7.0.77-jre8
Tagging tomcat:7.0-jre8
Tagging tomcat:7-jre8

$ test/run.sh tomcat:7.0.77-jre8
testing tomcat:7.0.77-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.77-jre8-alpine
Using bashbrew/cache:07ca578db20eb31aa6bddad85aa42d11756080a6d35c1eb13827d2ac81ea962e (tomcat:7.0.77-jre8-alpine)
Tagging tomcat:7.0.77-jre8-alpine
Tagging tomcat:7.0-jre8-alpine
Tagging tomcat:7-jre8-alpine

$ test/run.sh tomcat:7.0.77-jre8-alpine
testing tomcat:7.0.77-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.43-jre7
Using bashbrew/cache:829ab6aafc11d1b921f67367645bb05764a8782d0051613f817890a7f365f7d9 (tomcat:8.0.43-jre7)
Tagging tomcat:8.0.43-jre7
Tagging tomcat:8.0-jre7
Tagging tomcat:8.0.43
Tagging tomcat:8.0

$ test/run.sh tomcat:8.0.43-jre7
testing tomcat:8.0.43-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.43-jre7-alpine
Using bashbrew/cache:8e9a67a69b1e5acd7dad780a3fef6f7655e8dbd204647b5c532cb92b8edc576e (tomcat:8.0.43-jre7-alpine)
Tagging tomcat:8.0.43-jre7-alpine
Tagging tomcat:8.0-jre7-alpine
Tagging tomcat:8.0.43-alpine
Tagging tomcat:8.0-alpine

$ test/run.sh tomcat:8.0.43-jre7-alpine
testing tomcat:8.0.43-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.43-jre8
Using bashbrew/cache:86e34c77e242f32f493a118464d3edfe0b6762e4c117b779838ac27017ddc659 (tomcat:8.0.43-jre8)
Tagging tomcat:8.0.43-jre8
Tagging tomcat:8.0-jre8

$ test/run.sh tomcat:8.0.43-jre8
testing tomcat:8.0.43-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.43-jre8-alpine
Using bashbrew/cache:00208b62650dd5c6c8f1e46c4d9cfebb291feb432cb5794e1e4e46172c1373a5 (tomcat:8.0.43-jre8-alpine)
Tagging tomcat:8.0.43-jre8-alpine
Tagging tomcat:8.0-jre8-alpine

$ test/run.sh tomcat:8.0.43-jre8-alpine
testing tomcat:8.0.43-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.13-jre8
Using bashbrew/cache:8accdc3e981abda8fb7dcd4def1fa198d0b666430227776018de02836000c220 (tomcat:8.5.13-jre8)
Tagging tomcat:8.5.13-jre8
Tagging tomcat:8.5-jre8
Tagging tomcat:8-jre8
Tagging tomcat:jre8
Tagging tomcat:8.5.13
Tagging tomcat:8.5
Tagging tomcat:8
Tagging tomcat:latest

$ test/run.sh tomcat:8.5.13-jre8
testing tomcat:8.5.13-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.13-jre8-alpine
Using bashbrew/cache:d48a82f39e9abe99a0c7e6f4fdca21df64df68232973f1a751723bd54f673d1e (tomcat:8.5.13-jre8-alpine)
Tagging tomcat:8.5.13-jre8-alpine
Tagging tomcat:8.5-jre8-alpine
Tagging tomcat:8-jre8-alpine
Tagging tomcat:jre8-alpine
Tagging tomcat:8.5.13-alpine
Tagging tomcat:8.5-alpine
Tagging tomcat:8-alpine
Tagging tomcat:alpine

$ test/run.sh tomcat:8.5.13-jre8-alpine
testing tomcat:8.5.13-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.M19-jre8
Using bashbrew/cache:baaf0f01443388bf0ac5e4914715323d0c6892242cbd12ea3f49fcadba1ed036 (tomcat:9.0.0.M19-jre8)
Tagging tomcat:9.0.0.M19-jre8
Tagging tomcat:9.0.0-jre8
Tagging tomcat:9.0-jre8
Tagging tomcat:9-jre8
Tagging tomcat:9.0.0.M19
Tagging tomcat:9.0.0
Tagging tomcat:9.0
Tagging tomcat:9

$ test/run.sh tomcat:9.0.0.M19-jre8
testing tomcat:9.0.0.M19-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.M19-jre8-alpine
Using bashbrew/cache:d2541d72b44930d7fbc235a00313204115961542b9fae51df68fbaacd116e564 (tomcat:9.0.0.M19-jre8-alpine)
Tagging tomcat:9.0.0.M19-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.M19-alpine
Tagging tomcat:9.0.0-alpine
Tagging tomcat:9.0-alpine
Tagging tomcat:9-alpine

$ test/run.sh tomcat:9.0.0.M19-jre8-alpine
testing tomcat:9.0.0.M19-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

@yosifkit yosifkit merged commit c74e5d9 into docker-library:master Apr 11, 2017
@yosifkit yosifkit deleted the update-docker-library branch April 11, 2017 22:40
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