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

version bump: otp-19.3 #2758

Merged
merged 1 commit into from
Mar 21, 2017
Merged

version bump: otp-19.3 #2758

merged 1 commit into from
Mar 21, 2017

Conversation

tsloughter
Copy link
Contributor

cc @c0b

@yosifkit
Copy link
Member

diff --git a/_bashbrew-list b/_bashbrew-list
index d8b6817..ceeae7e 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -21,12 +21,9 @@ erlang:18.3.4.5-slim
 erlang:19
 erlang:19-onbuild
 erlang:19-slim
-erlang:19.2
-erlang:19.2-onbuild
-erlang:19.2-slim
-erlang:19.2.3
-erlang:19.2.3-onbuild
-erlang:19.2.3-slim
+erlang:19.3
+erlang:19.3-onbuild
+erlang:19.3-slim
 erlang:latest
 erlang:onbuild
 erlang:slim
diff --git a/erlang_latest/Dockerfile b/erlang_latest/Dockerfile
index f9f0d17..cd682b9 100644
--- a/erlang_latest/Dockerfile
+++ b/erlang_latest/Dockerfile
@@ -1,12 +1,12 @@
 FROM buildpack-deps:jessie
 
-ENV OTP_VERSION="19.2.3"
+ENV OTP_VERSION="19.3"
 
 # 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="51dd3eda2b5e835588ed215328c3943b69bc353d892577411570641f37c51ad8" \
+	&& OTP_DOWNLOAD_SHA256="fc82c5377ad9e84a37f67f2b2b50b27fe4e689440ae9e5d0f5dcfb440a9487ac" \
 	&& runtimeDeps='libodbc1 \
 			libsctp1 \
 			libwxgtk3.0-0' \
diff --git a/erlang_slim/Dockerfile b/erlang_slim/Dockerfile
index 3bfc7fd..59e3773 100644
--- a/erlang_slim/Dockerfile
+++ b/erlang_slim/Dockerfile
@@ -1,12 +1,12 @@
 FROM debian:jessie
 
-ENV OTP_VERSION="19.2.3"
+ENV OTP_VERSION="19.3"
 
 # 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="51dd3eda2b5e835588ed215328c3943b69bc353d892577411570641f37c51ad8" \
+	&& OTP_DOWNLOAD_SHA256="fc82c5377ad9e84a37f67f2b2b50b27fe4e689440ae9e5d0f5dcfb440a9487ac" \
 	&& runtimeDeps=' \
 		libodbc1 \
 		libssl1.0.0 \

@c0b
Copy link
Contributor

c0b commented Mar 20, 2017

looks good!

@yosifkit
Copy link
Member

Build test of #2758; 6f1dfd8 (erlang):

$ bashbrew build erlang:19.3
Building bashbrew/cache:f0ba03f4fed993e2f2625506ac97f0772ac4233ca29f8c72d7265fd828125421 (erlang:19.3)
Tagging erlang:19.3
Tagging erlang:19
Tagging erlang:latest

$ test/run.sh erlang:19.3
testing erlang:19.3
	'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-slim
Building bashbrew/cache:9cfda39ea6da6464cde4d77c776cb4d130581c1927da277f300ae254bbc020e0 (erlang:19.3-slim)
Tagging erlang:19.3-slim
Tagging erlang:19-slim
Tagging erlang:slim

$ test/run.sh erlang:19.3-slim
testing erlang:19.3-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:19.3-onbuild
Building bashbrew/cache:d3cb9082e07e201bbfcbae8ca87a51b03ff3c4b3c302a1a76c4706ce646ba90a (erlang:19.3-onbuild)
Tagging erlang:19.3-onbuild
Tagging erlang:19-onbuild
Tagging erlang:onbuild

$ test/run.sh erlang:19.3-onbuild
testing erlang:19.3-onbuild
	'override-cmd' [1/1]...passed


$ bashbrew build erlang:18.3.4.5
Using bashbrew/cache:d9f17ead9ae919672a9019d5dd1dc36c869af546c187bd006857ad07a40ad992 (erlang:18.3.4.5)
Tagging erlang:18.3.4.5
Tagging erlang:18.3.4
Tagging erlang:18.3
Tagging erlang:18

$ test/run.sh erlang:18.3.4.5
testing erlang:18.3.4.5
	'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.5-slim
Building bashbrew/cache:be083bd19c65e623bbefbb1842bdc582e72d3a4dc980d6c9ab5754f5f806960e (erlang:18.3.4.5-slim)
Tagging erlang:18.3.4.5-slim
Tagging erlang:18.3.4-slim
Tagging erlang:18.3-slim
Tagging erlang:18-slim

$ test/run.sh erlang:18.3.4.5-slim
testing erlang:18.3.4.5-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.5-onbuild
Using bashbrew/cache:8cfd4038cbbf77a1e4f3a833fe2cbf535e85dd3a541b757bf31e2848925d28ab (erlang:18.3.4.5-onbuild)
Tagging erlang:18.3.4.5-onbuild
Tagging erlang:18.3.4-onbuild
Tagging erlang:18.3-onbuild
Tagging erlang:18-onbuild

$ test/run.sh erlang:18.3.4.5-onbuild
testing erlang:18.3.4.5-onbuild
	'override-cmd' [1/1]...passed


$ bashbrew build erlang:17.5.6.9
Using bashbrew/cache:5386752ef6fd5738d8f3d16887ace7c22fee190a1da2bd9ca17498f39646a602 (erlang:17.5.6.9)
Tagging erlang:17.5.6.9
Tagging erlang:17.5.6
Tagging erlang:17.5
Tagging erlang:17

$ test/run.sh erlang:17.5.6.9
testing erlang:17.5.6.9
	'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:17.5.6.9-slim
Building bashbrew/cache:03267d3cdf0f24cb8d657082a9152d0108bfef1731c55a3bf919afa33a8f49f0 (erlang:17.5.6.9-slim)
Tagging erlang:17.5.6.9-slim
Tagging erlang:17.5.6-slim
Tagging erlang:17.5-slim
Tagging erlang:17-slim

$ test/run.sh erlang:17.5.6.9-slim
testing erlang:17.5.6.9-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

@yosifkit yosifkit merged commit 6bf7095 into docker-library:master Mar 21, 2017
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