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

erlang/otp 20.3.8.20 and 21.2.6, rebar3 3.9.0 #5453

Merged
merged 1 commit into from
Feb 20, 2019

Conversation

getong
Copy link
Contributor

@getong getong commented Feb 19, 2019

@tianon
Copy link
Member

tianon commented Feb 19, 2019

Should we skip #5448, or did you still want to go ahead with it?

@getong
Copy link
Contributor Author

getong commented Feb 20, 2019

Yes, you can skip #5448 .

@tianon
Copy link
Member

tianon commented Feb 20, 2019

Diff:
diff --git a/_bashbrew-list b/_bashbrew-list
index 3e88860..9858f0c 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -23,18 +23,18 @@ erlang:20.3-slim
 erlang:20.3.8
 erlang:20.3.8-alpine
 erlang:20.3.8-slim
-erlang:20.3.8.18
-erlang:20.3.8.18-alpine
-erlang:20.3.8.18-slim
+erlang:20.3.8.20
+erlang:20.3.8.20-alpine
+erlang:20.3.8.20-slim
 erlang:21
 erlang:21-alpine
 erlang:21-slim
 erlang:21.2
 erlang:21.2-alpine
 erlang:21.2-slim
-erlang:21.2.5
-erlang:21.2.5-alpine
-erlang:21.2.5-slim
+erlang:21.2.6
+erlang:21.2.6-alpine
+erlang:21.2.6-slim
 erlang:alpine
 erlang:latest
 erlang:slim
diff --git a/erlang_20-alpine/Dockerfile b/erlang_20-alpine/Dockerfile
index ac5e905..ac77cd8 100644
--- a/erlang_20-alpine/Dockerfile
+++ b/erlang_20-alpine/Dockerfile
@@ -1,12 +1,12 @@
 FROM alpine:3.8
 
-ENV OTP_VERSION="20.3.8.18" \
-     REBAR3_VERSION="3.8.0"
+ENV OTP_VERSION="20.3.8.20" \
+     REBAR3_VERSION="3.9.0"
 
 RUN set -xe \
 	&& OTP_DOWNLOAD_URL="https://github.com/erlang/otp/archive/OTP-${OTP_VERSION}.tar.gz" \
-	&& OTP_DOWNLOAD_SHA256="b3f4a353b633d4267a23a9b3d77c74b19b100545207e6b6bd065cde265395024" \
-	&& REBAR3_DOWNLOAD_SHA256="fc4d08037d39bcc651a4a749f8a5b1a10b2205527df834c2aee8f60725c3f431" \
+	&& OTP_DOWNLOAD_SHA256="7151e78f7c1d48e05459cec723ca75c3bc92e66e1e4ec47d876b6f6f5aae771e" \
+	&& REBAR3_DOWNLOAD_SHA256="9ea73ce4e60ad4b3108641eae73b4098fadb510142e672ad8e3a793f57e9f992" \
 	&& apk add --no-cache --virtual .fetch-deps \
 		curl \
 		ca-certificates \
diff --git a/erlang_20-slim/Dockerfile b/erlang_20-slim/Dockerfile
index e18f792..9ec1888 100644
--- a/erlang_20-slim/Dockerfile
+++ b/erlang_20-slim/Dockerfile
@@ -1,12 +1,12 @@
 FROM debian:stretch
 
-ENV OTP_VERSION="20.3.8.18"
+ENV OTP_VERSION="20.3.8.20"
 
 # We'll install the build dependencies, and purge them on the last step to make
 # sure our final image contains only what we've just built:
 RUN set -xe \
 	&& OTP_DOWNLOAD_URL="https://github.com/erlang/otp/archive/OTP-${OTP_VERSION}.tar.gz" \
-	&& OTP_DOWNLOAD_SHA256="b3f4a353b633d4267a23a9b3d77c74b19b100545207e6b6bd065cde265395024" \
+	&& OTP_DOWNLOAD_SHA256="7151e78f7c1d48e05459cec723ca75c3bc92e66e1e4ec47d876b6f6f5aae771e" \
 	&& fetchDeps=' \
 		curl \
 		ca-certificates' \
diff --git a/erlang_20/Dockerfile b/erlang_20/Dockerfile
index 5c82188..97bb497 100644
--- a/erlang_20/Dockerfile
+++ b/erlang_20/Dockerfile
@@ -1,12 +1,12 @@
 FROM buildpack-deps:stretch
 
-ENV OTP_VERSION="20.3.8.18"
+ENV OTP_VERSION="20.3.8.20"
 
 # We'll install the build dependencies for erlang-odbc along with the erlang
 # build process:
 RUN set -xe \
 	&& OTP_DOWNLOAD_URL="https://github.com/erlang/otp/archive/OTP-${OTP_VERSION}.tar.gz" \
-	&& OTP_DOWNLOAD_SHA256="b3f4a353b633d4267a23a9b3d77c74b19b100545207e6b6bd065cde265395024" \
+	&& OTP_DOWNLOAD_SHA256="7151e78f7c1d48e05459cec723ca75c3bc92e66e1e4ec47d876b6f6f5aae771e" \
 	&& runtimeDeps='libodbc1 \
 			libsctp1 \
 			libwxgtk3.0' \
@@ -51,11 +51,11 @@ RUN set -xe \
 	&& install -v ./rebar /usr/local/bin/ \
 	&& rm -rf /usr/src/rebar-src
 
-ENV REBAR3_VERSION="3.8.0"
+ENV REBAR3_VERSION="3.9.0"
 
 RUN set -xe \
 	&& REBAR3_DOWNLOAD_URL="https://github.com/erlang/rebar3/archive/${REBAR3_VERSION}.tar.gz" \
-	&& REBAR3_DOWNLOAD_SHA256="fc4d08037d39bcc651a4a749f8a5b1a10b2205527df834c2aee8f60725c3f431" \
+	&& REBAR3_DOWNLOAD_SHA256="9ea73ce4e60ad4b3108641eae73b4098fadb510142e672ad8e3a793f57e9f992" \
 	&& mkdir -p /usr/src/rebar3-src \
 	&& curl -fSL -o rebar3-src.tar.gz "$REBAR3_DOWNLOAD_URL" \
 	&& echo "$REBAR3_DOWNLOAD_SHA256 rebar3-src.tar.gz" | sha256sum -c - \
diff --git a/erlang_alpine/Dockerfile b/erlang_alpine/Dockerfile
index e5a2508..59b2c7c 100644
--- a/erlang_alpine/Dockerfile
+++ b/erlang_alpine/Dockerfile
@@ -1,12 +1,12 @@
 FROM alpine:3.9
 
-ENV OTP_VERSION="21.2.5" \
-    REBAR3_VERSION="3.8.0"
+ENV OTP_VERSION="21.2.6" \
+    REBAR3_VERSION="3.9.0"
 
 RUN set -xe \
 	&& OTP_DOWNLOAD_URL="https://github.com/erlang/otp/archive/OTP-${OTP_VERSION}.tar.gz" \
-	&& OTP_DOWNLOAD_SHA256="3ff578ab020a714be25d6787b81938df016db375692d4126a28f1303e6e9c165" \
-	&& REBAR3_DOWNLOAD_SHA256="fc4d08037d39bcc651a4a749f8a5b1a10b2205527df834c2aee8f60725c3f431" \
+	&& OTP_DOWNLOAD_SHA256="aa0b95031e7c01af8a7042a00974ab16ed8fec305a68d7dbaa4185e5d58ef4d5" \
+	&& REBAR3_DOWNLOAD_SHA256="9ea73ce4e60ad4b3108641eae73b4098fadb510142e672ad8e3a793f57e9f992" \
 	&& apk add --no-cache --virtual .fetch-deps \
 		curl \
 		ca-certificates \
diff --git a/erlang_latest/Dockerfile b/erlang_latest/Dockerfile
index 2df8a6c..8d3ffa6 100644
--- a/erlang_latest/Dockerfile
+++ b/erlang_latest/Dockerfile
@@ -1,12 +1,12 @@
 FROM buildpack-deps:stretch
 
-ENV OTP_VERSION="21.2.5"
+ENV OTP_VERSION="21.2.6"
 
 # We'll install the build dependencies for erlang-odbc along with the erlang
 # build process:
 RUN set -xe \
 	&& OTP_DOWNLOAD_URL="https://github.com/erlang/otp/archive/OTP-${OTP_VERSION}.tar.gz" \
-	&& OTP_DOWNLOAD_SHA256="3ff578ab020a714be25d6787b81938df016db375692d4126a28f1303e6e9c165" \
+	&& OTP_DOWNLOAD_SHA256="aa0b95031e7c01af8a7042a00974ab16ed8fec305a68d7dbaa4185e5d58ef4d5" \
 	&& runtimeDeps='libodbc1 \
 			libsctp1 \
 			libwxgtk3.0' \
@@ -51,11 +51,11 @@ RUN set -xe \
 	&& install -v ./rebar /usr/local/bin/ \
 	&& rm -rf /usr/src/rebar-src
 
-ENV REBAR3_VERSION="3.8.0"
+ENV REBAR3_VERSION="3.9.0"
 
 RUN set -xe \
 	&& REBAR3_DOWNLOAD_URL="https://github.com/erlang/rebar3/archive/${REBAR3_VERSION}.tar.gz" \
-	&& REBAR3_DOWNLOAD_SHA256="fc4d08037d39bcc651a4a749f8a5b1a10b2205527df834c2aee8f60725c3f431" \
+	&& REBAR3_DOWNLOAD_SHA256="9ea73ce4e60ad4b3108641eae73b4098fadb510142e672ad8e3a793f57e9f992" \
 	&& mkdir -p /usr/src/rebar3-src \
 	&& curl -fSL -o rebar3-src.tar.gz "$REBAR3_DOWNLOAD_URL" \
 	&& echo "$REBAR3_DOWNLOAD_SHA256 rebar3-src.tar.gz" | sha256sum -c - \
diff --git a/erlang_slim/Dockerfile b/erlang_slim/Dockerfile
index 15b4464..89146e4 100644
--- a/erlang_slim/Dockerfile
+++ b/erlang_slim/Dockerfile
@@ -1,12 +1,12 @@
 FROM debian:stretch
 
-ENV OTP_VERSION="21.2.5"
+ENV OTP_VERSION="21.2.6"
 
 # We'll install the build dependencies, and purge them on the last step to make
 # sure our final image contains only what we've just built:
 RUN set -xe \
 	&& OTP_DOWNLOAD_URL="https://github.com/erlang/otp/archive/OTP-${OTP_VERSION}.tar.gz" \
-	&& OTP_DOWNLOAD_SHA256="3ff578ab020a714be25d6787b81938df016db375692d4126a28f1303e6e9c165" \
+	&& OTP_DOWNLOAD_SHA256="aa0b95031e7c01af8a7042a00974ab16ed8fec305a68d7dbaa4185e5d58ef4d5" \
 	&& fetchDeps=' \
 		curl \
 		ca-certificates' \

@tianon
Copy link
Member

tianon commented Feb 20, 2019

LGTM

Build test of #5453; cb55ccc; amd64 (erlang):

$ bashbrew build erlang:21.2.6
Building bashbrew/cache:5492a5a7cd9ff53de8f6c38015d90963f04390529f3970a208fd544b4fd6b8f7 (erlang:21.2.6)
Tagging erlang:21.2.6
Tagging erlang:21.2
Tagging erlang:21
Tagging erlang:latest

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


$ bashbrew build erlang:21.2.6-slim
Building bashbrew/cache:c2ed38df9007d6f561226150ede8aafb31ac1db8f3f7579a696e0215382166e7 (erlang:21.2.6-slim)
Tagging erlang:21.2.6-slim
Tagging erlang:21.2-slim
Tagging erlang:21-slim
Tagging erlang:slim

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


$ bashbrew build erlang:21.2.6-alpine
Building bashbrew/cache:7300bf5d1e5e146b42d825466f7122c979b60145b2aacd7c43916772c06dfebc (erlang:21.2.6-alpine)
Tagging erlang:21.2.6-alpine
Tagging erlang:21.2-alpine
Tagging erlang:21-alpine
Tagging erlang:alpine

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


$ bashbrew build erlang:20.3.8.20
Building bashbrew/cache:e8c75b49b5d9460fdb51131ee05d77479e1273a246170c305703f3c104d40489 (erlang:20.3.8.20)
Tagging erlang:20.3.8.20
Tagging erlang:20.3.8
Tagging erlang:20.3
Tagging erlang:20

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


$ bashbrew build erlang:20.3.8.20-slim
Building bashbrew/cache:f1bb9d7b2200d5eb0ad729fef2e70ceae2710c0d65c94e96b1f1fed214258e8e (erlang:20.3.8.20-slim)
Tagging erlang:20.3.8.20-slim
Tagging erlang:20.3.8-slim
Tagging erlang:20.3-slim
Tagging erlang:20-slim

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


$ bashbrew build erlang:20.3.8.20-alpine
Building bashbrew/cache:ba1ea10591127a177eb857eee50489eceb57d9e41ed52bd9369e98e8f35bad33 (erlang:20.3.8.20-alpine)
Tagging erlang:20.3.8.20-alpine
Tagging erlang:20.3.8-alpine
Tagging erlang:20.3-alpine
Tagging erlang:20-alpine

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


$ bashbrew build erlang:19.3.6.13
Using bashbrew/cache:330419615959091e7f5e5e5ce62379da7a6b5dca948b9430b4738361c19b9538 (erlang:19.3.6.13)
Tagging erlang:19.3.6.13
Tagging erlang:19.3.6
Tagging erlang:19.3
Tagging erlang:19

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


$ bashbrew build erlang:19.3.6.13-slim
Using bashbrew/cache:90d232ad60744a5fdd6c6af1e601f451230fd8023606ebfd43107ea5cf693897 (erlang:19.3.6.13-slim)
Tagging erlang:19.3.6.13-slim
Tagging erlang:19.3.6-slim
Tagging erlang:19.3-slim
Tagging erlang:19-slim

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


$ bashbrew build erlang:18.3.4.11
Using bashbrew/cache:22f8a0a78c0fa213f90f3f73d2fe749350add431fa3c00d77f0a626f4bfc4331 (erlang:18.3.4.11)
Tagging erlang:18.3.4.11
Tagging erlang:18.3.4
Tagging erlang:18.3
Tagging erlang:18

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


$ bashbrew build erlang:18.3.4.11-slim
Using bashbrew/cache:fe171b767b9adc844419737c3c2770aaa89aad1bd52b58448381c1691cea76d2 (erlang:18.3.4.11-slim)
Tagging erlang:18.3.4.11-slim
Tagging erlang:18.3.4-slim
Tagging erlang:18.3-slim
Tagging erlang:18-slim

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

@tianon tianon merged commit e4be401 into docker-library:master Feb 20, 2019
@getong getong deleted the erlang-21.2.6 branch February 20, 2019 23:36
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