erlang/otp 26.0 #14667
Merged
erlang/otp 26.0 #14667
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This comment has been minimized.
This comment has been minimized.
-FROM alpine:3.17
+FROM alpine:3.16Oops, looks like Erlang 26 has an older version of Alpine than Erlang 25 had been updated to - was this intentional? (Should that be updated to Alpine 3.17 or even 3.18?) |
|
@tianon |
Diff for 9585553:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 598c4d1..75b95e3 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -66,32 +66,32 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: da9d65bc7c3eea24e8c4d48db746e687d9851f4a
Directory: 24/slim
-Tags: 25.3.2.0, 25.3.2, 25.3, 25, latest
+Tags: 25.3.2.0, 25.3.2, 25.3, 25
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: e56b9ef7fb17dbf4c02dce10ce93b5f7f89e4141
Directory: 25
-Tags: 25.3.2.0-alpine, 25.3.2-alpine, 25.3-alpine, 25-alpine, alpine
+Tags: 25.3.2.0-alpine, 25.3.2-alpine, 25.3-alpine, 25-alpine
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: e56b9ef7fb17dbf4c02dce10ce93b5f7f89e4141
Directory: 25/alpine
-Tags: 25.3.2.0-slim, 25.3.2-slim, 25.3-slim, 25-slim, slim
+Tags: 25.3.2.0-slim, 25.3.2-slim, 25.3-slim, 25-slim
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: e56b9ef7fb17dbf4c02dce10ce93b5f7f89e4141
Directory: 25/slim
-Tags: 26.0-rc3.0.0, 26.0-rc3.0, 26.0-rc3, 26
+Tags: 26.0.0.0, 26.0.0, 26.0, 26, latest
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: d1aa031e5b5980f25d28983ae17af2a70ea76905
+GitCommit: b42d51c5cfd3100a31f1e463dcefe31e815e896f
Directory: 26
-Tags: 26.0-rc3.0.0-alpine, 26.0-rc3.0-alpine, 26.0-rc3-alpine, 26-alpine
+Tags: 26.0.0.0-alpine, 26.0.0-alpine, 26.0-alpine, 26-alpine, alpine
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: d1aa031e5b5980f25d28983ae17af2a70ea76905
+GitCommit: b99497690af4fc92ab414ff79aceffabea8a3c28
Directory: 26/alpine
-Tags: 26.0-rc3.0.0-slim, 26.0-rc3.0-slim, 26.0-rc3-slim, 26-slim
+Tags: 26.0.0.0-slim, 26.0.0-slim, 26.0-slim, 26-slim, slim
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: d1aa031e5b5980f25d28983ae17af2a70ea76905
+GitCommit: b42d51c5cfd3100a31f1e463dcefe31e815e896f
Directory: 26/slim
diff --git a/_bashbrew-list b/_bashbrew-list
index 333f162..962fe36 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -65,15 +65,15 @@ erlang:25.3.2.0-slim
erlang:26
erlang:26-alpine
erlang:26-slim
-erlang:26.0-rc3
-erlang:26.0-rc3-alpine
-erlang:26.0-rc3-slim
-erlang:26.0-rc3.0
-erlang:26.0-rc3.0-alpine
-erlang:26.0-rc3.0-slim
-erlang:26.0-rc3.0.0
-erlang:26.0-rc3.0.0-alpine
-erlang:26.0-rc3.0.0-slim
+erlang:26.0
+erlang:26.0-alpine
+erlang:26.0-slim
+erlang:26.0.0
+erlang:26.0.0-alpine
+erlang:26.0.0-slim
+erlang:26.0.0.0
+erlang:26.0.0.0-alpine
+erlang:26.0.0.0-slim
erlang:alpine
erlang:latest
erlang:slim
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index fda0511..1c6a918 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -11,9 +11,9 @@ erlang:23-slim
erlang:24
erlang:24-alpine
erlang:24-slim
+erlang:25
+erlang:25-alpine
+erlang:25-slim
erlang:latest
erlang:alpine
erlang:slim
-erlang:26
-erlang:26-alpine
-erlang:26-slim
diff --git a/erlang_alpine/Dockerfile b/erlang_25-alpine/Dockerfile
similarity index 100%
copy from erlang_alpine/Dockerfile
copy to erlang_25-alpine/Dockerfile
diff --git a/erlang_slim/Dockerfile b/erlang_25-slim/Dockerfile
similarity index 100%
copy from erlang_slim/Dockerfile
copy to erlang_25-slim/Dockerfile
diff --git a/erlang_latest/Dockerfile b/erlang_25/Dockerfile
similarity index 100%
copy from erlang_latest/Dockerfile
copy to erlang_25/Dockerfile
diff --git a/erlang_26-alpine/Dockerfile b/erlang_26-alpine/Dockerfile
deleted file mode 100644
index 9fd5480..0000000
diff --git a/erlang_26-slim/Dockerfile b/erlang_26-slim/Dockerfile
deleted file mode 100644
index 29965c9..0000000
diff --git a/erlang_26/Dockerfile b/erlang_26/Dockerfile
deleted file mode 100644
index c28c2d8..0000000
diff --git a/erlang_alpine/Dockerfile b/erlang_alpine/Dockerfile
index f0b1e53..dfc6734 100644
--- a/erlang_alpine/Dockerfile
+++ b/erlang_alpine/Dockerfile
@@ -1,13 +1,13 @@
-FROM alpine:3.17
+FROM alpine:3.18
-ENV OTP_VERSION="25.3.2" \
+ENV OTP_VERSION="26.0" \
REBAR3_VERSION="3.20.0"
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="504fc2045198c192de7edbb04e880cbb1ee79b1d9880270b8af8ed2348d2e242" \
+ && OTP_DOWNLOAD_SHA256="29a50b17cb4bc326f01e4cbb2badb6a31ec586525f7c2f29166a0c6229b53f24" \
&& REBAR3_DOWNLOAD_SHA256="53ed7f294a8b8fb4d7d75988c69194943831c104d39832a1fa30307b1a8593de" \
&& apk add --no-cache --virtual .fetch-deps \
curl \
diff --git a/erlang_latest/Dockerfile b/erlang_latest/Dockerfile
index 7ce17aa..cf50979 100644
--- a/erlang_latest/Dockerfile
+++ b/erlang_latest/Dockerfile
@@ -1,6 +1,6 @@
FROM buildpack-deps:bullseye
-ENV OTP_VERSION="25.3.2" \
+ENV OTP_VERSION="26.0" \
REBAR3_VERSION="3.20.0"
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="504fc2045198c192de7edbb04e880cbb1ee79b1d9880270b8af8ed2348d2e242" \
+ && OTP_DOWNLOAD_SHA256="29a50b17cb4bc326f01e4cbb2badb6a31ec586525f7c2f29166a0c6229b53f24" \
&& runtimeDeps='libodbc1 \
libsctp1 \
libwxgtk3.0 \
diff --git a/erlang_slim/Dockerfile b/erlang_slim/Dockerfile
index 1dc4ca4..e793264 100644
--- a/erlang_slim/Dockerfile
+++ b/erlang_slim/Dockerfile
@@ -1,6 +1,6 @@
FROM debian:bullseye
-ENV OTP_VERSION="25.3.2" \
+ENV OTP_VERSION="26.0" \
REBAR3_VERSION="3.20.0"
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="504fc2045198c192de7edbb04e880cbb1ee79b1d9880270b8af8ed2348d2e242" \
+ && OTP_DOWNLOAD_SHA256="29a50b17cb4bc326f01e4cbb2badb6a31ec586525f7c2f29166a0c6229b53f24" \
&& fetchDeps=' \
curl \
ca-certificates' \Relevant Maintainers:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.