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.2.2 & 18.3.4.5 #2614

Merged
merged 1 commit into from
Feb 3, 2017

Conversation

c0b
Copy link
Contributor

@c0b c0b commented Feb 3, 2017

@yosifkit
Copy link
Member

yosifkit commented Feb 3, 2017

diff --git a/erlang_18-slim/Dockerfile b/erlang_18-slim/Dockerfile
index 766d756..16a8415 100644
--- a/erlang_18-slim/Dockerfile
+++ b/erlang_18-slim/Dockerfile
@@ -1,12 +1,12 @@
 FROM debian:jessie
 
-ENV OTP_VERSION="18.3.4.4"
+ENV OTP_VERSION="18.3.4.5"
 
 # 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="3956f5c4fcd05848c7fe048d5c4ef7eaf002a8312cba0674150c5a10ab0e9f04" \
+	&& OTP_DOWNLOAD_SHA256="a27b8ff057f77305e7c9f2dbcd002232856438fd1fdf3822edd27c6f77a60ca1" \
 	&& runtimeDeps=' \
 		libodbc1 \
 		libssl1.0.0 \
diff --git a/erlang_18/Dockerfile b/erlang_18/Dockerfile
index 96a84b5..6362a4b 100644
--- a/erlang_18/Dockerfile
+++ b/erlang_18/Dockerfile
@@ -1,12 +1,12 @@
 FROM buildpack-deps:jessie
 
-ENV OTP_VERSION="18.3.4.4"
+ENV OTP_VERSION="18.3.4.5"
 
 # 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="3956f5c4fcd05848c7fe048d5c4ef7eaf002a8312cba0674150c5a10ab0e9f04" \
+	&& OTP_DOWNLOAD_SHA256="a27b8ff057f77305e7c9f2dbcd002232856438fd1fdf3822edd27c6f77a60ca1" \
 	&& runtimeDeps='libodbc1 \
 			libsctp1' \
 	&& buildDeps='unixodbc-dev \
@@ -32,11 +32,11 @@ CMD ["erl"]
 
 # extra useful tools here: rebar & rebar3
 
-ENV REBAR_VERSION="2.6.2"
+ENV REBAR_VERSION="2.6.4"
 
 RUN set -xe \
 	&& REBAR_DOWNLOAD_URL="https://github.com/rebar/rebar/archive/${REBAR_VERSION##*@}.tar.gz" \
-	&& REBAR_DOWNLOAD_SHA256="ed2a49300f2f8ae7c95284e53e95dd85430952d2843ce224a17db2b312964400" \
+	&& REBAR_DOWNLOAD_SHA256="577246bafa2eb2b2c3f1d0c157408650446884555bf87901508ce71d5cc0bd07" \
 	&& mkdir -p /usr/src/rebar-src \
 	&& curl -fSL -o rebar-src.tar.gz "$REBAR_DOWNLOAD_URL" \
 	&& echo "$REBAR_DOWNLOAD_SHA256 rebar-src.tar.gz" | sha256sum -c - \
@@ -47,11 +47,11 @@ RUN set -xe \
 	&& install -v ./rebar /usr/local/bin/ \
 	&& rm -rf /usr/src/rebar-src
 
-ENV REBAR3_VERSION="3.2.0"
+ENV REBAR3_VERSION="3.3.4"
 
 RUN set -xe \
 	&& REBAR3_DOWNLOAD_URL="https://github.com/erlang/rebar3/archive/${REBAR3_VERSION##*@}.tar.gz" \
-	&& REBAR3_DOWNLOAD_SHA256="78ad27372eea6e215790e161ae46f451c107a58a019cc7fb4551487903516455" \
+	&& REBAR3_DOWNLOAD_SHA256="a7ad962617f1e91347257b7c6c69612aee564e1172b8507947e173b8846a204d" \
 	&& 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_latest/Dockerfile b/erlang_latest/Dockerfile
index d2fe8a5..e8e8900 100644
--- a/erlang_latest/Dockerfile
+++ b/erlang_latest/Dockerfile
@@ -1,12 +1,12 @@
 FROM buildpack-deps:jessie
 
-ENV OTP_VERSION="19.2"
+ENV OTP_VERSION="19.2.2"
 
 # 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="c6adbc82a45baa49bf9f5b524089da480dd27113c51b3d147aeb196fdb90516b" \
+	&& OTP_DOWNLOAD_SHA256="1875ebcf4a83274757b02ea41070e73bb03eed49e5fa822fbf527ce9d1a28157" \
 	&& runtimeDeps='libodbc1 \
 			libsctp1 \
 			libwxgtk3.0-0' \
@@ -51,11 +51,11 @@ RUN set -xe \
 	&& install -v ./rebar /usr/local/bin/ \
 	&& rm -rf /usr/src/rebar-src
 
-ENV REBAR3_VERSION="3.3.3"
+ENV REBAR3_VERSION="3.3.4"
 
 RUN set -xe \
 	&& REBAR3_DOWNLOAD_URL="https://github.com/erlang/rebar3/archive/${REBAR3_VERSION}.tar.gz" \
-	&& REBAR3_DOWNLOAD_SHA256="fd8ac211287e2b30249275720aa8d1a4e955c851b6e1f4de17024cbb0eec6f6d" \
+	&& REBAR3_DOWNLOAD_SHA256="a7ad962617f1e91347257b7c6c69612aee564e1172b8507947e173b8846a204d" \
 	&& 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_onbuild/Dockerfile b/erlang_onbuild/Dockerfile
index 739e439..f10f99e 100644
--- a/erlang_onbuild/Dockerfile
+++ b/erlang_onbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM erlang:19.1
+FROM erlang:19
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
diff --git a/erlang_slim/Dockerfile b/erlang_slim/Dockerfile
index 3f01e5f..1a358a4 100644
--- a/erlang_slim/Dockerfile
+++ b/erlang_slim/Dockerfile
@@ -1,12 +1,12 @@
 FROM debian:jessie
 
-ENV OTP_VERSION="19.2"
+ENV OTP_VERSION="19.2.2"
 
 # 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="c6adbc82a45baa49bf9f5b524089da480dd27113c51b3d147aeb196fdb90516b" \
+	&& OTP_DOWNLOAD_SHA256="1875ebcf4a83274757b02ea41070e73bb03eed49e5fa822fbf527ce9d1a28157" \
 	&& runtimeDeps=' \
 		libodbc1 \
 		libssl1.0.0 \

@yosifkit
Copy link
Member

yosifkit commented Feb 3, 2017

Build test of #2614; 1bdc16c (erlang):

$ bashbrew build erlang:19.2.2
Building bashbrew/cache:a01e35c2e8d2df262f582c3e60f932b005bb3026b7620ed124f8228aa58e5f36 (erlang:19.2.2)
Tagging erlang:19.2.2
Tagging erlang:19.2
Tagging erlang:19
Tagging erlang:latest

$ test/run.sh erlang:19.2.2
testing erlang:19.2.2
	'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.2.2-slim
Building bashbrew/cache:5de81c12f37c5ca9a9f547accc4f069de627b94c534ffb9a10ca97f1641bb088 (erlang:19.2.2-slim)
Tagging erlang:19.2.2-slim
Tagging erlang:19.2-slim
Tagging erlang:19-slim
Tagging erlang:slim

$ test/run.sh erlang:19.2.2-slim
testing erlang:19.2.2-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.2.2-onbuild
Building bashbrew/cache:3ebfdb18d67700302c43109b2963cb85f337840930686df7a3ccfad4facb6d18 (erlang:19.2.2-onbuild)
Tagging erlang:19.2.2-onbuild
Tagging erlang:19.2-onbuild
Tagging erlang:19-onbuild
Tagging erlang:onbuild

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


$ bashbrew build erlang:18.3.4.5
Building bashbrew/cache:dac91cf0c40da771cac37af0d91b73763eb2fc2315b715810460565ac5a45379 (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:738abcddd7390ec33d6cf68f00bd2c7e043748689989188825d1f60ef94e01d6 (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
Building bashbrew/cache:e93db4584065c775259c054cab7ba1f8b8af83e079f28f0d77c73f4a319150f9 (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:de3d1bf6ee2f6286cb270b9950ad85c0460e077011a52447a3f4acce33d2d79e (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
Using bashbrew/cache:4a4853895d34baa8b54567f169e5a8d24ca6879f3bb1c23b056007914f007d4a (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 2ec55c3 into docker-library:master Feb 3, 2017
@c0b c0b deleted the feat/otp-19.2.2 branch February 3, 2017 21:07
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