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 23.3.4.4 #10383

Merged
merged 1 commit into from
Jun 23, 2021
Merged

erlang/otp 23.3.4.4 #10383

merged 1 commit into from
Jun 23, 2021

Conversation

getong
Copy link
Contributor

@getong getong commented Jun 17, 2021

No description provided.

@github-actions
Copy link

Diff for b8a3236:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index ec1b7cd..621bc39 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -58,7 +58,7 @@ Directory: 22
 
 Tags: 22.3.4.20-alpine, 22.3.4-alpine, 22.3-alpine, 22-alpine
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 563db88eea30a7ae5bc5aea6643b6b186a555c35
+GitCommit: ecf3785f0fca514b53b3802ac1d7b977eb4a3316
 Directory: 22/alpine
 
 Tags: 22.3.4.20-slim, 22.3.4-slim, 22.3-slim, 22-slim
@@ -66,19 +66,19 @@ Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 563db88eea30a7ae5bc5aea6643b6b186a555c35
 Directory: 22/slim
 
-Tags: 23.3.4.3, 23.3.4, 23.3, 23
+Tags: 23.3.4.4, 23.3.4, 23.3, 23
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: aa423fb73fe72170fc5d9112ff90a167c696bed3
+GitCommit: 5f4eace5c3c8feb18934d6c45697950dbe4f4f93
 Directory: 23
 
-Tags: 23.3.4.3-alpine, 23.3.4-alpine, 23.3-alpine, 23-alpine
+Tags: 23.3.4.4-alpine, 23.3.4-alpine, 23.3-alpine, 23-alpine
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: aa423fb73fe72170fc5d9112ff90a167c696bed3
+GitCommit: ecf3785f0fca514b53b3802ac1d7b977eb4a3316
 Directory: 23/alpine
 
-Tags: 23.3.4.3-slim, 23.3.4-slim, 23.3-slim, 23-slim
+Tags: 23.3.4.4-slim, 23.3.4-slim, 23.3-slim, 23-slim
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: aa423fb73fe72170fc5d9112ff90a167c696bed3
+GitCommit: 5f4eace5c3c8feb18934d6c45697950dbe4f4f93
 Directory: 23/slim
 
 Tags: 24.0.2.0, 24.0.2, 24.0, 24, latest
@@ -88,7 +88,7 @@ Directory: 24
 
 Tags: 24.0.2.0-alpine, 24.0.2-alpine, 24.0-alpine, 24-alpine, alpine
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 563db88eea30a7ae5bc5aea6643b6b186a555c35
+GitCommit: ecf3785f0fca514b53b3802ac1d7b977eb4a3316
 Directory: 24/alpine
 
 Tags: 24.0.2.0-slim, 24.0.2-slim, 24.0-slim, 24-slim, slim
diff --git a/_bashbrew-list b/_bashbrew-list
index 35c9dd2..ac1a518 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -59,9 +59,9 @@ erlang:23.3-slim
 erlang:23.3.4
 erlang:23.3.4-alpine
 erlang:23.3.4-slim
-erlang:23.3.4.3
-erlang:23.3.4.3-alpine
-erlang:23.3.4.3-slim
+erlang:23.3.4.4
+erlang:23.3.4.4-alpine
+erlang:23.3.4.4-slim
 erlang:24
 erlang:24-alpine
 erlang:24-slim
diff --git a/erlang_22-alpine/Dockerfile b/erlang_22-alpine/Dockerfile
index 65c05ce..a848f80 100644
--- a/erlang_22-alpine/Dockerfile
+++ b/erlang_22-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.13
+FROM alpine:3.14
 
 ENV OTP_VERSION="22.3.4.20" \
     REBAR3_VERSION="3.16.1"
diff --git a/erlang_23-alpine/Dockerfile b/erlang_23-alpine/Dockerfile
index efaca14..f387cd8 100644
--- a/erlang_23-alpine/Dockerfile
+++ b/erlang_23-alpine/Dockerfile
@@ -1,13 +1,13 @@
-FROM alpine:3.13
+FROM alpine:3.14
 
-ENV OTP_VERSION="23.3.4.3" \
+ENV OTP_VERSION="23.3.4.4" \
     REBAR3_VERSION="3.16.1"
 
 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="e706338c3017451e43fc88fc4abe77675b56cfe3c95a342567db9f3a22ceef72" \
+	&& OTP_DOWNLOAD_SHA256="092826c21eee21068ff71cad4bc0713997cf59ec45e10e2f30d07d592865e010" \
 	&& REBAR3_DOWNLOAD_SHA256="a14711b09f6e1fc1b080b79d78c304afebcbb7fafed9d0972eb739f0ed89121b" \
 	&& apk add --no-cache --virtual .fetch-deps \
 		curl \
diff --git a/erlang_23-slim/Dockerfile b/erlang_23-slim/Dockerfile
index 3ef1dfe..f60f6ba 100644
--- a/erlang_23-slim/Dockerfile
+++ b/erlang_23-slim/Dockerfile
@@ -1,6 +1,6 @@
 FROM debian:buster
 
-ENV OTP_VERSION="23.3.4.3" \
+ENV OTP_VERSION="23.3.4.4" \
     REBAR3_VERSION="3.16.1"
 
 LABEL org.opencontainers.image.version=$OTP_VERSION
@@ -9,7 +9,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="e706338c3017451e43fc88fc4abe77675b56cfe3c95a342567db9f3a22ceef72" \
+	&& OTP_DOWNLOAD_SHA256="092826c21eee21068ff71cad4bc0713997cf59ec45e10e2f30d07d592865e010" \
 	&& fetchDeps=' \
 		curl \
 		ca-certificates' \
diff --git a/erlang_23/Dockerfile b/erlang_23/Dockerfile
index 45edffd..ae3b69e 100644
--- a/erlang_23/Dockerfile
+++ b/erlang_23/Dockerfile
@@ -1,6 +1,6 @@
 FROM buildpack-deps:buster
 
-ENV OTP_VERSION="23.3.4.3" \
+ENV OTP_VERSION="23.3.4.4" \
     REBAR3_VERSION="3.16.1"
 
 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="e706338c3017451e43fc88fc4abe77675b56cfe3c95a342567db9f3a22ceef72" \
+	&& OTP_DOWNLOAD_SHA256="092826c21eee21068ff71cad4bc0713997cf59ec45e10e2f30d07d592865e010" \
 	&& runtimeDeps='libodbc1 \
 			libsctp1 \
 			libwxgtk3.0' \
diff --git a/erlang_alpine/Dockerfile b/erlang_alpine/Dockerfile
index 040d288..4eb4ccd 100644
--- a/erlang_alpine/Dockerfile
+++ b/erlang_alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.13
+FROM alpine:3.14
 
 ENV OTP_VERSION="24.0.2" \
     REBAR3_VERSION="3.16.1"

@yosifkit
Copy link
Member

Apologies for the delay, I've been hesitant to merge this since our servers have been unable to build Alpine 3.14 based images and we're still working on that (#10379 (comment)).

If you don't mind the Alpine images failing for a bit, we can go ahead and merge.

@getong
Copy link
Contributor Author

getong commented Jun 23, 2021

Apologies for the delay, I've been hesitant to merge this since our servers have been unable to build Alpine 3.14 based images and we're still working on that (#10379 (comment)).

If you don't mind the Alpine images failing for a bit, we can go ahead and merge.

Yes, please merge it.

@yosifkit yosifkit merged commit 90254fb into docker-library:master Jun 23, 2021
@getong getong deleted the erlang-23.3.4.4 branch June 23, 2021 02:02
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