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 20.0.1 #3140

Merged
merged 1 commit into from
Jul 5, 2017
Merged

erlang 20.0.1 #3140

merged 1 commit into from
Jul 5, 2017

Conversation

getong
Copy link
Contributor

@getong getong commented Jul 5, 2017

No description provided.

@yosifkit
Copy link
Member

yosifkit commented Jul 5, 2017

Diff:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index 68596cd..a9111fc 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -3,7 +3,7 @@ erlang:17-slim @ amd64
 erlang:18 @ amd64
 erlang:18-slim @ amd64
 erlang:19 @ amd64
-erlang:20.0-alpine @ amd64
-erlang:20.0-slim @ amd64
+erlang:20.0.1-alpine @ amd64
+erlang:20.0.1-slim @ amd64
 erlang:latest @ amd64
 erlang:slim @ amd64
diff --git a/_bashbrew-list b/_bashbrew-list
index 1323d48..e771910 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -20,8 +20,8 @@ erlang:19.3
 erlang:19.3-slim
 erlang:19.3.6.1
 erlang:19.3.6.1-slim
-erlang:20.0
-erlang:20.0-alpine
-erlang:20.0-slim
+erlang:20.0.1
+erlang:20.0.1-alpine
+erlang:20.0.1-slim
 erlang:latest
 erlang:slim
diff --git a/erlang_20.0-alpine/Dockerfile b/erlang_20.0.1-alpine/Dockerfile
similarity index 93%
rename from erlang_20.0-alpine/Dockerfile
rename to erlang_20.0.1-alpine/Dockerfile
index d36f8f8..3a27733 100644
--- a/erlang_20.0-alpine/Dockerfile
+++ b/erlang_20.0.1-alpine/Dockerfile
@@ -1,10 +1,10 @@
 FROM alpine:3.6
 
-ENV OTP_VERSION="20.0"
+ENV OTP_VERSION="20.0.1"
 
 RUN set -xe \
 	&& OTP_DOWNLOAD_URL="https://github.com/erlang/otp/archive/OTP-${OTP_VERSION}.tar.gz" \
-	&& OTP_DOWNLOAD_SHA256="548815fe08f5b661d38334ffa480e9e0614db5c505da7cb0dc260e729697f2ab" \
+	&& OTP_DOWNLOAD_SHA256="8b121b38102acd43f89afd786055461741522c3a13ee17ef1a795c0dbf6aa281" \
 	&& apk add --no-cache --virtual .fetch-deps \
 		curl \
 		ca-certificates \
diff --git a/erlang_20.0-slim/Dockerfile b/erlang_20.0.1-slim/Dockerfile
similarity index 92%
rename from erlang_20.0-slim/Dockerfile
rename to erlang_20.0.1-slim/Dockerfile
index deb021d..d2beb2d 100644
--- a/erlang_20.0-slim/Dockerfile
+++ b/erlang_20.0.1-slim/Dockerfile
@@ -1,12 +1,12 @@
 FROM debian:jessie
 
-ENV OTP_VERSION="20.0"
+ENV OTP_VERSION="20.0.1"
 
 # 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="548815fe08f5b661d38334ffa480e9e0614db5c505da7cb0dc260e729697f2ab" \
+	&& OTP_DOWNLOAD_SHA256="8b121b38102acd43f89afd786055461741522c3a13ee17ef1a795c0dbf6aa281" \
 	&& fetchDeps=' \
 		curl \
 		ca-certificates' \
diff --git a/erlang_latest/Dockerfile b/erlang_latest/Dockerfile
index 82b97c8..a153f3f 100644
--- a/erlang_latest/Dockerfile
+++ b/erlang_latest/Dockerfile
@@ -1,12 +1,12 @@
 FROM buildpack-deps:jessie
 
-ENV OTP_VERSION="20.0"
+ENV OTP_VERSION="20.0.1"
 
 # 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="548815fe08f5b661d38334ffa480e9e0614db5c505da7cb0dc260e729697f2ab" \
+	&& OTP_DOWNLOAD_SHA256="8b121b38102acd43f89afd786055461741522c3a13ee17ef1a795c0dbf6aa281" \
 	&& runtimeDeps='libodbc1 \
 			libsctp1 \
 			libwxgtk3.0-0' \

@yosifkit
Copy link
Member

yosifkit commented Jul 5, 2017

Build test of #3140; e1fecd5 (erlang):

$ bashbrew build erlang:20.0.1
Building bashbrew/cache:0459cbfc1b59308dcdefc690679102206d66c96862d52b75aa480fe1dd9326bc (erlang:20.0.1)
Tagging erlang:20.0.1
Tagging erlang:latest

$ test/run.sh erlang:20.0.1
testing erlang:20.0.1
	'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.0.1-slim
Building bashbrew/cache:c4f2e412e85ab3c61e512ae38fcfb1f92a53d2953209043eb9929b3802825932 (erlang:20.0.1-slim)
Tagging erlang:20.0.1-slim

$ test/run.sh erlang:20.0.1-slim
testing erlang:20.0.1-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.0.1-alpine
Building bashbrew/cache:ba42595eb500f3abfc686c636c738c8934cb15341affcf21b642ff23dc76c6ff (erlang:20.0.1-alpine)
Tagging erlang:20.0.1-alpine

$ test/run.sh erlang:20.0.1-alpine
testing erlang:20.0.1-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.1
Using bashbrew/cache:7fee85e3329cf03df2e4d18d6d6ba936fadd63d92f8ce87bfc6d57e7eac1423b (erlang:19.3.6.1)
Tagging erlang:19.3.6.1
Tagging erlang:19.3
Tagging erlang:19

$ test/run.sh erlang:19.3.6.1
testing erlang:19.3.6.1
	'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.1-slim
Using bashbrew/cache:0070c7a231f3b4227cdba5673af2060f02f0249695c31663bcd1b90245efc340 (erlang:19.3.6.1-slim)
Tagging erlang:19.3.6.1-slim
Tagging erlang:19.3-slim
Tagging erlang:19-slim
Tagging erlang:slim

$ test/run.sh erlang:19.3.6.1-slim
testing erlang:19.3.6.1-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
Using bashbrew/cache:460ba0183e410276aab63d4bb662d5c2e7724ca586696055c901848742a1af7d (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
Using bashbrew/cache:38bed4738262345c93068bde33248837d2c05ed212f7575c93467c4902cf348f (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:17.5.6.9
Using bashbrew/cache:7b81676825a74467fdf1f85ef9845376fd6f5b846e7bf235b21d1532a74079fc (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:82a19d19996cb1c9694318a70527ec16010c4b897762267903b0ad438dd2bbc0 (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 33b48cd into docker-library:master Jul 5, 2017
@getong getong deleted the erlang_20.0.1 branch July 6, 2017 04:25
@@ -3,16 +3,16 @@
Maintainers: Mr C0B <denc716@gmail.com> (@c0b)
GitRepo: https://github.com/c0b/docker-erlang-otp.git

Tags: 20.0, latest
GitCommit: 8128be859f47c39473be9fa2c2ae33af28f74279
Tags: 20.0.1, latest
Copy link
Contributor

@c0b c0b Jul 16, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@getong I've just realized that the last PR to docker-library wasn't run from https://github.com/c0b/docker-erlang-otp/blob/25224b9/generate-stackbrew-library.sh ? so that the tag 20.0 is missing; if run from the script, it will generate something like Tags: 20.0.1 20.0 20 latest

so that if pull erlang:20 image at the moment, it is still pointing the 20.0 image not the 20.0.1 image; this is a problem.

so please run from /generate-stackbrew-library.sh if you do the PR next time.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@c0b #3199 fix it. Thanks.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Besides, erlang/docker-erlang-otp#59 fix the latest tag.

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