haxe: remove alpine3.16, add alpine3.20 #17132
Merged
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
Diff for 8542588:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 8620c58..a18be31 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,11 +1,6 @@
Maintainers: Andy Li <andy@onthewings.net> (@andyli)
GitRepo: https://github.com/HaxeFoundation/docker-library-haxe.git
-Tags: 4.0.5-alpine3.16, 4.0-alpine3.16
-Architectures: amd64, arm64v8
-GitCommit: 5a0bf6fd06e6c8ec052cf0a2bbd83b39932a1839
-Directory: 4.0/alpine3.16
-
Tags: 4.0.5-alpine3.17, 4.0-alpine3.17
Architectures: amd64, arm64v8
GitCommit: 5a0bf6fd06e6c8ec052cf0a2bbd83b39932a1839
@@ -16,11 +11,16 @@ Architectures: amd64, arm64v8
GitCommit: b7003bc3280e69dc057ef0e6e8dfb8fd44ce4741
Directory: 4.0/alpine3.18
-Tags: 4.0.5-alpine3.19, 4.0-alpine3.19, 4.0.5-alpine, 4.0-alpine
+Tags: 4.0.5-alpine3.19, 4.0-alpine3.19
Architectures: amd64, arm64v8
GitCommit: b7f47ba7340373d40202dfb77621de1ed3ba3677
Directory: 4.0/alpine3.19
+Tags: 4.0.5-alpine3.20, 4.0-alpine3.20, 4.0.5-alpine, 4.0-alpine
+Architectures: amd64, arm64v8
+GitCommit: c678f34e8951bdb1359e08021276df5d38ac83df
+Directory: 4.0/alpine3.20
+
Tags: 4.0.5-bullseye, 4.0-bullseye
SharedTags: 4.0.5, 4.0
Architectures: amd64, arm32v7, arm64v8
@@ -41,11 +41,6 @@ GitCommit: c0367972017a7b87845bf33477e29b1fe64ccc4a
Directory: 4.0/windowsservercore-ltsc2022
Constraints: windowsservercore-ltsc2022
-Tags: 4.1.5-alpine3.16, 4.1-alpine3.16
-Architectures: amd64, arm64v8
-GitCommit: 5a0bf6fd06e6c8ec052cf0a2bbd83b39932a1839
-Directory: 4.1/alpine3.16
-
Tags: 4.1.5-alpine3.17, 4.1-alpine3.17
Architectures: amd64, arm64v8
GitCommit: 5a0bf6fd06e6c8ec052cf0a2bbd83b39932a1839
@@ -56,11 +51,16 @@ Architectures: amd64, arm64v8
GitCommit: b7003bc3280e69dc057ef0e6e8dfb8fd44ce4741
Directory: 4.1/alpine3.18
-Tags: 4.1.5-alpine3.19, 4.1-alpine3.19, 4.1.5-alpine, 4.1-alpine
+Tags: 4.1.5-alpine3.19, 4.1-alpine3.19
Architectures: amd64, arm64v8
GitCommit: b7f47ba7340373d40202dfb77621de1ed3ba3677
Directory: 4.1/alpine3.19
+Tags: 4.1.5-alpine3.20, 4.1-alpine3.20, 4.1.5-alpine, 4.1-alpine
+Architectures: amd64, arm64v8
+GitCommit: c678f34e8951bdb1359e08021276df5d38ac83df
+Directory: 4.1/alpine3.20
+
Tags: 4.1.5-bullseye, 4.1-bullseye
SharedTags: 4.1.5, 4.1
Architectures: amd64, arm32v7, arm64v8
@@ -81,11 +81,6 @@ GitCommit: c0367972017a7b87845bf33477e29b1fe64ccc4a
Directory: 4.1/windowsservercore-ltsc2022
Constraints: windowsservercore-ltsc2022
-Tags: 4.2.5-alpine3.16, 4.2-alpine3.16
-Architectures: amd64, arm64v8
-GitCommit: 5a0bf6fd06e6c8ec052cf0a2bbd83b39932a1839
-Directory: 4.2/alpine3.16
-
Tags: 4.2.5-alpine3.17, 4.2-alpine3.17
Architectures: amd64, arm64v8
GitCommit: 5a0bf6fd06e6c8ec052cf0a2bbd83b39932a1839
@@ -96,11 +91,16 @@ Architectures: amd64, arm64v8
GitCommit: b7003bc3280e69dc057ef0e6e8dfb8fd44ce4741
Directory: 4.2/alpine3.18
-Tags: 4.2.5-alpine3.19, 4.2-alpine3.19, 4.2.5-alpine, 4.2-alpine
+Tags: 4.2.5-alpine3.19, 4.2-alpine3.19
Architectures: amd64, arm64v8
GitCommit: b7f47ba7340373d40202dfb77621de1ed3ba3677
Directory: 4.2/alpine3.19
+Tags: 4.2.5-alpine3.20, 4.2-alpine3.20, 4.2.5-alpine, 4.2-alpine
+Architectures: amd64, arm64v8
+GitCommit: c678f34e8951bdb1359e08021276df5d38ac83df
+Directory: 4.2/alpine3.20
+
Tags: 4.2.5-bookworm, 4.2-bookworm
SharedTags: 4.2.5, 4.2
Architectures: amd64, arm32v7, arm64v8
@@ -126,11 +126,6 @@ GitCommit: c0367972017a7b87845bf33477e29b1fe64ccc4a
Directory: 4.2/windowsservercore-ltsc2022
Constraints: windowsservercore-ltsc2022
-Tags: 4.3.4-alpine3.16, 4.3-alpine3.16
-Architectures: amd64, arm64v8
-GitCommit: 882ff89f78244a8a5b05faaf7d4fe9933528f6ca
-Directory: 4.3/alpine3.16
-
Tags: 4.3.4-alpine3.17, 4.3-alpine3.17
Architectures: amd64, arm64v8
GitCommit: 882ff89f78244a8a5b05faaf7d4fe9933528f6ca
@@ -141,11 +136,16 @@ Architectures: amd64, arm64v8
GitCommit: 882ff89f78244a8a5b05faaf7d4fe9933528f6ca
Directory: 4.3/alpine3.18
-Tags: 4.3.4-alpine3.19, 4.3-alpine3.19, 4.3.4-alpine, 4.3-alpine
+Tags: 4.3.4-alpine3.19, 4.3-alpine3.19
Architectures: amd64, arm64v8
GitCommit: 882ff89f78244a8a5b05faaf7d4fe9933528f6ca
Directory: 4.3/alpine3.19
+Tags: 4.3.4-alpine3.20, 4.3-alpine3.20, 4.3.4-alpine, 4.3-alpine
+Architectures: amd64, arm64v8
+GitCommit: c678f34e8951bdb1359e08021276df5d38ac83df
+Directory: 4.3/alpine3.20
+
Tags: 4.3.4-bookworm, 4.3-bookworm
SharedTags: 4.3.4, 4.3, latest
Architectures: amd64, arm32v7, arm64v8
diff --git a/_bashbrew-list b/_bashbrew-list
index 75f5001..b7eb0a7 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,49 +1,49 @@
haxe:4.0
haxe:4.0-alpine
-haxe:4.0-alpine3.16
haxe:4.0-alpine3.17
haxe:4.0-alpine3.18
haxe:4.0-alpine3.19
+haxe:4.0-alpine3.20
haxe:4.0-bullseye
haxe:4.0-windowsservercore
haxe:4.0-windowsservercore-1809
haxe:4.0-windowsservercore-ltsc2022
haxe:4.0.5
haxe:4.0.5-alpine
-haxe:4.0.5-alpine3.16
haxe:4.0.5-alpine3.17
haxe:4.0.5-alpine3.18
haxe:4.0.5-alpine3.19
+haxe:4.0.5-alpine3.20
haxe:4.0.5-bullseye
haxe:4.0.5-windowsservercore
haxe:4.0.5-windowsservercore-1809
haxe:4.0.5-windowsservercore-ltsc2022
haxe:4.1
haxe:4.1-alpine
-haxe:4.1-alpine3.16
haxe:4.1-alpine3.17
haxe:4.1-alpine3.18
haxe:4.1-alpine3.19
+haxe:4.1-alpine3.20
haxe:4.1-bullseye
haxe:4.1-windowsservercore
haxe:4.1-windowsservercore-1809
haxe:4.1-windowsservercore-ltsc2022
haxe:4.1.5
haxe:4.1.5-alpine
-haxe:4.1.5-alpine3.16
haxe:4.1.5-alpine3.17
haxe:4.1.5-alpine3.18
haxe:4.1.5-alpine3.19
+haxe:4.1.5-alpine3.20
haxe:4.1.5-bullseye
haxe:4.1.5-windowsservercore
haxe:4.1.5-windowsservercore-1809
haxe:4.1.5-windowsservercore-ltsc2022
haxe:4.2
haxe:4.2-alpine
-haxe:4.2-alpine3.16
haxe:4.2-alpine3.17
haxe:4.2-alpine3.18
haxe:4.2-alpine3.19
+haxe:4.2-alpine3.20
haxe:4.2-bookworm
haxe:4.2-bullseye
haxe:4.2-windowsservercore
@@ -51,10 +51,10 @@ haxe:4.2-windowsservercore-1809
haxe:4.2-windowsservercore-ltsc2022
haxe:4.2.5
haxe:4.2.5-alpine
-haxe:4.2.5-alpine3.16
haxe:4.2.5-alpine3.17
haxe:4.2.5-alpine3.18
haxe:4.2.5-alpine3.19
+haxe:4.2.5-alpine3.20
haxe:4.2.5-bookworm
haxe:4.2.5-bullseye
haxe:4.2.5-windowsservercore
@@ -62,10 +62,10 @@ haxe:4.2.5-windowsservercore-1809
haxe:4.2.5-windowsservercore-ltsc2022
haxe:4.3
haxe:4.3-alpine
-haxe:4.3-alpine3.16
haxe:4.3-alpine3.17
haxe:4.3-alpine3.18
haxe:4.3-alpine3.19
+haxe:4.3-alpine3.20
haxe:4.3-bookworm
haxe:4.3-bullseye
haxe:4.3-windowsservercore
@@ -73,10 +73,10 @@ haxe:4.3-windowsservercore-1809
haxe:4.3-windowsservercore-ltsc2022
haxe:4.3.4
haxe:4.3.4-alpine
-haxe:4.3.4-alpine3.16
haxe:4.3.4-alpine3.17
haxe:4.3.4-alpine3.18
haxe:4.3.4-alpine3.19
+haxe:4.3.4-alpine3.20
haxe:4.3.4-bookworm
haxe:4.3.4-bullseye
haxe:4.3.4-windowsservercore
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 39aa29a..c8bc8e7 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,29 +1,29 @@
haxe:4.0-alpine
-haxe:4.0-alpine3.16
haxe:4.0-alpine3.17
haxe:4.0-alpine3.18
+haxe:4.0-alpine3.19
haxe:4.0-bullseye
haxe:4.0-windowsservercore-1809
haxe:4.0-windowsservercore-ltsc2022
haxe:4.1-alpine
-haxe:4.1-alpine3.16
haxe:4.1-alpine3.17
haxe:4.1-alpine3.18
+haxe:4.1-alpine3.19
haxe:4.1-bullseye
haxe:4.1-windowsservercore-1809
haxe:4.1-windowsservercore-ltsc2022
haxe:4.2-alpine
-haxe:4.2-alpine3.16
haxe:4.2-alpine3.17
haxe:4.2-alpine3.18
+haxe:4.2-alpine3.19
haxe:4.2-bookworm
haxe:4.2-bullseye
haxe:4.2-windowsservercore-1809
haxe:4.2-windowsservercore-ltsc2022
haxe:4.3-alpine
-haxe:4.3-alpine3.16
haxe:4.3-alpine3.17
haxe:4.3-alpine3.18
+haxe:4.3-alpine3.19
haxe:4.3-bookworm
haxe:4.3-bullseye
haxe:4.3-windowsservercore-1809
diff --git a/haxe_4.0-alpine/Dockerfile b/haxe_4.0-alpine/Dockerfile
index b80af9b..fdf6ba3 100644
--- a/haxe_4.0-alpine/Dockerfile
+++ b/haxe_4.0-alpine/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.19
+FROM alpine:3.20
# ensure local haxe is preferred over distribution haxe
ENV PATH /usr/local/bin:$PATH
@@ -37,7 +37,7 @@ RUN set -ex \
linux-headers \
pcre-dev \
mariadb-dev \
- mbedtls-dev \
+ mbedtls2-dev \
ninja \
sqlite-dev \
&& cd /usr/src/neko \
@@ -53,7 +53,7 @@ RUN set -ex \
bash \
pcre-dev \
zlib-dev \
- mbedtls-dev \
+ mbedtls2-dev \
make \
opam \
aspcud \
diff --git a/haxe_4.0-alpine3.16/Dockerfile b/haxe_4.0-alpine3.16/Dockerfile
deleted file mode 100644
index acc01e5..0000000
diff --git a/haxe_4.0-alpine/Dockerfile b/haxe_4.0-alpine3.19/Dockerfile
similarity index 100%
copy from haxe_4.0-alpine/Dockerfile
copy to haxe_4.0-alpine3.19/Dockerfile
diff --git a/haxe_4.1-alpine/Dockerfile b/haxe_4.1-alpine/Dockerfile
index b6cc830..a0c4f9e 100644
--- a/haxe_4.1-alpine/Dockerfile
+++ b/haxe_4.1-alpine/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.19
+FROM alpine:3.20
# ensure local haxe is preferred over distribution haxe
ENV PATH /usr/local/bin:$PATH
@@ -37,7 +37,7 @@ RUN set -ex \
linux-headers \
pcre-dev \
mariadb-dev \
- mbedtls-dev \
+ mbedtls2-dev \
ninja \
sqlite-dev \
&& cd /usr/src/neko \
@@ -53,7 +53,7 @@ RUN set -ex \
bash \
pcre-dev \
zlib-dev \
- mbedtls-dev \
+ mbedtls2-dev \
make \
opam \
aspcud \
diff --git a/haxe_4.1-alpine3.16/Dockerfile b/haxe_4.1-alpine3.16/Dockerfile
deleted file mode 100644
index 5d3447e..0000000
diff --git a/haxe_4.1-alpine/Dockerfile b/haxe_4.1-alpine3.19/Dockerfile
similarity index 100%
copy from haxe_4.1-alpine/Dockerfile
copy to haxe_4.1-alpine3.19/Dockerfile
diff --git a/haxe_4.2-alpine/Dockerfile b/haxe_4.2-alpine/Dockerfile
index d86205d..86ee51d 100644
--- a/haxe_4.2-alpine/Dockerfile
+++ b/haxe_4.2-alpine/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.19
+FROM alpine:3.20
# ensure local haxe is preferred over distribution haxe
ENV PATH /usr/local/bin:$PATH
@@ -37,7 +37,7 @@ RUN set -ex \
linux-headers \
pcre-dev \
mariadb-dev \
- mbedtls-dev \
+ mbedtls2-dev \
ninja \
sqlite-dev \
&& cd /usr/src/neko \
@@ -53,7 +53,7 @@ RUN set -ex \
bash \
pcre-dev \
zlib-dev \
- mbedtls-dev \
+ mbedtls2-dev \
make \
opam \
aspcud \
diff --git a/haxe_4.2-alpine3.16/Dockerfile b/haxe_4.2-alpine3.16/Dockerfile
deleted file mode 100644
index 89b0e7b..0000000
diff --git a/haxe_4.2-alpine/Dockerfile b/haxe_4.2-alpine3.19/Dockerfile
similarity index 100%
copy from haxe_4.2-alpine/Dockerfile
copy to haxe_4.2-alpine3.19/Dockerfile
diff --git a/haxe_4.3-alpine/Dockerfile b/haxe_4.3-alpine/Dockerfile
index bf9a845..f58c978 100644
--- a/haxe_4.3-alpine/Dockerfile
+++ b/haxe_4.3-alpine/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.19
+FROM alpine:3.20
# ensure local haxe is preferred over distribution haxe
ENV PATH /usr/local/bin:$PATH
@@ -37,7 +37,7 @@ RUN set -ex \
linux-headers \
pcre-dev \
mariadb-dev \
- mbedtls-dev \
+ mbedtls2-dev \
ninja \
sqlite-dev \
&& cd /usr/src/neko \
@@ -53,7 +53,7 @@ RUN set -ex \
bash \
pcre2-dev \
zlib-dev \
- mbedtls-dev \
+ mbedtls2-dev \
make \
opam \
aspcud \
diff --git a/haxe_4.3-alpine3.16/Dockerfile b/haxe_4.3-alpine3.16/Dockerfile
deleted file mode 100644
index df2326f..0000000
diff --git a/haxe_4.3-alpine/Dockerfile b/haxe_4.3-alpine3.19/Dockerfile
similarity index 100%
copy from haxe_4.3-alpine/Dockerfile
copy to haxe_4.3-alpine3.19/DockerfileRelevant 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.
#16801 (comment)