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 22.3.4.4, 21.3.8.17 #8408

Merged
merged 1 commit into from
Jul 30, 2020

Conversation

getong
Copy link
Contributor

@getong getong commented Jul 22, 2020

@yosifkit
Copy link
Member

Since debian:stretch in now LTS, it no longer supports ppc64le or s390x.

Invalid 'FROM' + 'Architectures' combinations detected:

 - erlang:18.3.4.11-slim (FROM debian:stretch) [s390x]
 - erlang:19.3.6.13-slim (FROM debian:stretch) [s390x]
 - erlang:20.3.8.26-slim (FROM debian:stretch) [ppc64le, s390x]
 - erlang:21.3.8.17-slim (FROM debian:stretch) [ppc64le, s390x]

@getong getong force-pushed the erlang-22.3.4.4 branch from 2fccb04 to 144e781 Compare July 30, 2020 02:01
@getong
Copy link
Contributor Author

getong commented Jul 30, 2020

@yosifkit
Done as you suggedted.

@github-actions
Copy link

Diff for 144e781:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index dbb11dd..2b22014 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,68 +2,68 @@ Maintainers: Mr C0B <denc716@gmail.com> (@c0b)
 GitRepo: https://github.com/erlang/docker-erlang-otp.git
 
 Tags: 18.3.4.11, 18.3.4, 18.3, 18
-Architectures: amd64, arm32v7, arm64v8, i386, s390x
+Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: e91894d9d9c3651382834b77978a05fa057338fb
 Directory: 18
 
 Tags: 18.3.4.11-slim, 18.3.4-slim, 18.3-slim, 18-slim
-Architectures: amd64, arm32v7, arm64v8, i386, s390x
+Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: e91894d9d9c3651382834b77978a05fa057338fb
 Directory: 18/slim
 
 Tags: 19.3.6.13, 19.3.6, 19.3, 19
-Architectures: amd64, arm32v7, arm64v8, i386, s390x
+Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: e91894d9d9c3651382834b77978a05fa057338fb
 Directory: 19
 
 Tags: 19.3.6.13-slim, 19.3.6-slim, 19.3-slim, 19-slim
-Architectures: amd64, arm32v7, arm64v8, i386, s390x
+Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: e91894d9d9c3651382834b77978a05fa057338fb
 Directory: 19/slim
 
 Tags: 20.3.8.26, 20.3.8, 20.3, 20
-Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: b06bf8de34e693b3698f3a22e8ff864dc320b380
 Directory: 20
 
 Tags: 20.3.8.26-alpine, 20.3.8-alpine, 20.3-alpine, 20-alpine
-Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: b06bf8de34e693b3698f3a22e8ff864dc320b380
 Directory: 20/alpine
 
 Tags: 20.3.8.26-slim, 20.3.8-slim, 20.3-slim, 20-slim
-Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: b06bf8de34e693b3698f3a22e8ff864dc320b380
 Directory: 20/slim
 
-Tags: 21.3.8.16, 21.3.8, 21.3, 21
-Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 4c6605055beca4454ca1dadf24a6efd34114e1ce
+Tags: 21.3.8.17, 21.3.8, 21.3, 21
+Architectures: amd64, arm32v7, arm64v8, i386
+GitCommit: 0e7cc44242f6cf9e6ac84925f70ead97fda96c43
 Directory: 21
 
-Tags: 21.3.8.16-alpine, 21.3.8-alpine, 21.3-alpine, 21-alpine
-Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 4c6605055beca4454ca1dadf24a6efd34114e1ce
+Tags: 21.3.8.17-alpine, 21.3.8-alpine, 21.3-alpine, 21-alpine
+Architectures: amd64, arm32v7, arm64v8, i386
+GitCommit: 0e7cc44242f6cf9e6ac84925f70ead97fda96c43
 Directory: 21/alpine
 
-Tags: 21.3.8.16-slim, 21.3.8-slim, 21.3-slim, 21-slim
-Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 4c6605055beca4454ca1dadf24a6efd34114e1ce
+Tags: 21.3.8.17-slim, 21.3.8-slim, 21.3-slim, 21-slim
+Architectures: amd64, arm32v7, arm64v8, i386
+GitCommit: 0e7cc44242f6cf9e6ac84925f70ead97fda96c43
 Directory: 21/slim
 
-Tags: 22.3.4.3, 22.3.4, 22.3, 22
+Tags: 22.3.4.4, 22.3.4, 22.3, 22
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: ad81251a67f669df6d613d5e0ed61d0654edc97b
+GitCommit: 32e4b1c8ac7f1d8aad76e5331ba509a35cb16d75
 Directory: 22
 
-Tags: 22.3.4.3-alpine, 22.3.4-alpine, 22.3-alpine, 22-alpine
+Tags: 22.3.4.4-alpine, 22.3.4-alpine, 22.3-alpine, 22-alpine
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: ad81251a67f669df6d613d5e0ed61d0654edc97b
+GitCommit: 32e4b1c8ac7f1d8aad76e5331ba509a35cb16d75
 Directory: 22/alpine
 
-Tags: 22.3.4.3-slim, 22.3.4-slim, 22.3-slim, 22-slim
+Tags: 22.3.4.4-slim, 22.3.4-slim, 22.3-slim, 22-slim
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: ad81251a67f669df6d613d5e0ed61d0654edc97b
+GitCommit: 32e4b1c8ac7f1d8aad76e5331ba509a35cb16d75
 Directory: 22/slim
 
 Tags: 23.0.3, 23.0, 23, latest
diff --git a/_bashbrew-list b/_bashbrew-list
index 15596c8..6a43b05 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -35,9 +35,9 @@ erlang:21.3-slim
 erlang:21.3.8
 erlang:21.3.8-alpine
 erlang:21.3.8-slim
-erlang:21.3.8.16
-erlang:21.3.8.16-alpine
-erlang:21.3.8.16-slim
+erlang:21.3.8.17
+erlang:21.3.8.17-alpine
+erlang:21.3.8.17-slim
 erlang:22
 erlang:22-alpine
 erlang:22-slim
@@ -47,9 +47,9 @@ erlang:22.3-slim
 erlang:22.3.4
 erlang:22.3.4-alpine
 erlang:22.3.4-slim
-erlang:22.3.4.3
-erlang:22.3.4.3-alpine
-erlang:22.3.4.3-slim
+erlang:22.3.4.4
+erlang:22.3.4.4-alpine
+erlang:22.3.4.4-slim
 erlang:23
 erlang:23-alpine
 erlang:23-slim
diff --git a/erlang_21-alpine/Dockerfile b/erlang_21-alpine/Dockerfile
index 370366c..3ad754d 100644
--- a/erlang_21-alpine/Dockerfile
+++ b/erlang_21-alpine/Dockerfile
@@ -1,13 +1,13 @@
 FROM alpine:3.9
 
-ENV OTP_VERSION="21.3.8.16" \
+ENV OTP_VERSION="21.3.8.17" \
     REBAR3_VERSION="3.13.2"
 
 LABEL org.opencontainers.image.version=$OTP_VERSION
 
 RUN set -xe \
 	&& OTP_DOWNLOAD_URL="https://github.com/erlang/otp/archive/OTP-${OTP_VERSION}.tar.gz" \
-	&& OTP_DOWNLOAD_SHA256="c0a5b680d33d2c58bc16ce10ab9f4c37695b3d5b5a42ca880067e19c26ce4a44" \
+	&& OTP_DOWNLOAD_SHA256="ee2ab2be55adaeea3ffbe97141cd5f1729bc4d0aaf24f70d3aa8e4cbc40e4910" \
 	&& REBAR3_DOWNLOAD_SHA256="e14cdc1f5b7d363a238a9f555f89e878bc4fc836c970571b41b90ee947f91505" \
 	&& apk add --no-cache --virtual .fetch-deps \
 		curl \
diff --git a/erlang_21-slim/Dockerfile b/erlang_21-slim/Dockerfile
index d78ce66..8fc1d2b 100644
--- a/erlang_21-slim/Dockerfile
+++ b/erlang_21-slim/Dockerfile
@@ -1,6 +1,6 @@
 FROM debian:stretch
 
-ENV OTP_VERSION="21.3.8.16"
+ENV OTP_VERSION="21.3.8.17"
 
 LABEL org.opencontainers.image.version=$OTP_VERSION
 
@@ -8,7 +8,7 @@ LABEL org.opencontainers.image.version=$OTP_VERSION
 # 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="c0a5b680d33d2c58bc16ce10ab9f4c37695b3d5b5a42ca880067e19c26ce4a44" \
+	&& OTP_DOWNLOAD_SHA256="ee2ab2be55adaeea3ffbe97141cd5f1729bc4d0aaf24f70d3aa8e4cbc40e4910" \
 	&& fetchDeps=' \
 		curl \
 		ca-certificates' \
diff --git a/erlang_21/Dockerfile b/erlang_21/Dockerfile
index 3b9f58c..8f7a888 100644
--- a/erlang_21/Dockerfile
+++ b/erlang_21/Dockerfile
@@ -1,6 +1,6 @@
 FROM buildpack-deps:stretch
 
-ENV OTP_VERSION="21.3.8.16" \
+ENV OTP_VERSION="21.3.8.17" \
     REBAR3_VERSION="3.13.2"
 
 LABEL org.opencontainers.image.version=$OTP_VERSION
@@ -9,7 +9,7 @@ LABEL org.opencontainers.image.version=$OTP_VERSION
 # build process:
 RUN set -xe \
 	&& OTP_DOWNLOAD_URL="https://github.com/erlang/otp/archive/OTP-${OTP_VERSION}.tar.gz" \
-	&& OTP_DOWNLOAD_SHA256="c0a5b680d33d2c58bc16ce10ab9f4c37695b3d5b5a42ca880067e19c26ce4a44" \
+	&& OTP_DOWNLOAD_SHA256="ee2ab2be55adaeea3ffbe97141cd5f1729bc4d0aaf24f70d3aa8e4cbc40e4910" \
 	&& runtimeDeps='libodbc1 \
 			libsctp1 \
 			libwxgtk3.0' \
diff --git a/erlang_22-alpine/Dockerfile b/erlang_22-alpine/Dockerfile
index 02e36f0..9753b52 100644
--- a/erlang_22-alpine/Dockerfile
+++ b/erlang_22-alpine/Dockerfile
@@ -1,13 +1,13 @@
 FROM alpine:3.11
 
-ENV OTP_VERSION="22.3.4.3" \
+ENV OTP_VERSION="22.3.4.4" \
     REBAR3_VERSION="3.13.2"
 
 LABEL org.opencontainers.image.version=$OTP_VERSION
 
 RUN set -xe \
 	&& OTP_DOWNLOAD_URL="https://github.com/erlang/otp/archive/OTP-${OTP_VERSION}.tar.gz" \
-	&& OTP_DOWNLOAD_SHA256="557376f7fef07fd7f08eedebcd23de8c921d7dfc9430e214d29a4726d92537d2" \
+	&& OTP_DOWNLOAD_SHA256="8dd1f21eadf5973f3278a4035a629f538bfbe3664679b45fe1d94b65f2f4a716" \
 	&& REBAR3_DOWNLOAD_SHA256="e14cdc1f5b7d363a238a9f555f89e878bc4fc836c970571b41b90ee947f91505" \
 	&& apk add --no-cache --virtual .fetch-deps \
 		curl \
diff --git a/erlang_22-slim/Dockerfile b/erlang_22-slim/Dockerfile
index 1c6d50e..9352dc5 100644
--- a/erlang_22-slim/Dockerfile
+++ b/erlang_22-slim/Dockerfile
@@ -1,6 +1,6 @@
 FROM debian:buster
 
-ENV OTP_VERSION="22.3.4.3"
+ENV OTP_VERSION="22.3.4.4"
 
 LABEL org.opencontainers.image.version=$OTP_VERSION
 
@@ -8,7 +8,7 @@ LABEL org.opencontainers.image.version=$OTP_VERSION
 # 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="557376f7fef07fd7f08eedebcd23de8c921d7dfc9430e214d29a4726d92537d2" \
+	&& OTP_DOWNLOAD_SHA256="8dd1f21eadf5973f3278a4035a629f538bfbe3664679b45fe1d94b65f2f4a716" \
 	&& fetchDeps=' \
 		curl \
 		ca-certificates' \
diff --git a/erlang_22/Dockerfile b/erlang_22/Dockerfile
index 7f75c00..712c656 100644
--- a/erlang_22/Dockerfile
+++ b/erlang_22/Dockerfile
@@ -1,6 +1,6 @@
 FROM buildpack-deps:buster
 
-ENV OTP_VERSION="22.3.4.3" \
+ENV OTP_VERSION="22.3.4.4" \
     REBAR3_VERSION="3.13.2"
 
 LABEL org.opencontainers.image.version=$OTP_VERSION
@@ -9,7 +9,7 @@ LABEL org.opencontainers.image.version=$OTP_VERSION
 # build process:
 RUN set -xe \
 	&& OTP_DOWNLOAD_URL="https://github.com/erlang/otp/archive/OTP-${OTP_VERSION}.tar.gz" \
-	&& OTP_DOWNLOAD_SHA256="557376f7fef07fd7f08eedebcd23de8c921d7dfc9430e214d29a4726d92537d2" \
+	&& OTP_DOWNLOAD_SHA256="8dd1f21eadf5973f3278a4035a629f538bfbe3664679b45fe1d94b65f2f4a716" \
 	&& runtimeDeps='libodbc1 \
 			libsctp1 \
 			libwxgtk3.0' \

@yosifkit yosifkit merged commit e97314c into docker-library:master Jul 30, 2020
@getong getong deleted the erlang-22.3.4.4 branch July 31, 2020 03:39
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.

2 participants