haxe: remove buster, add bookworm #17131
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 6df6a62:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 3d8eb4a..8620c58 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -27,11 +27,6 @@ Architectures: amd64, arm32v7, arm64v8
GitCommit: 5a0bf6fd06e6c8ec052cf0a2bbd83b39932a1839
Directory: 4.0/bullseye
-Tags: 4.0.5-buster, 4.0-buster
-Architectures: amd64, arm32v7, arm64v8
-GitCommit: 5a0bf6fd06e6c8ec052cf0a2bbd83b39932a1839
-Directory: 4.0/buster
-
Tags: 4.0.5-windowsservercore-1809, 4.0-windowsservercore-1809
SharedTags: 4.0.5-windowsservercore, 4.0-windowsservercore, 4.0.5, 4.0
Architectures: windows-amd64
@@ -72,11 +67,6 @@ Architectures: amd64, arm32v7, arm64v8
GitCommit: 5a0bf6fd06e6c8ec052cf0a2bbd83b39932a1839
Directory: 4.1/bullseye
-Tags: 4.1.5-buster, 4.1-buster
-Architectures: amd64, arm32v7, arm64v8
-GitCommit: 5a0bf6fd06e6c8ec052cf0a2bbd83b39932a1839
-Directory: 4.1/buster
-
Tags: 4.1.5-windowsservercore-1809, 4.1-windowsservercore-1809
SharedTags: 4.1.5-windowsservercore, 4.1-windowsservercore, 4.1.5, 4.1
Architectures: windows-amd64
@@ -111,16 +101,16 @@ Architectures: amd64, arm64v8
GitCommit: b7f47ba7340373d40202dfb77621de1ed3ba3677
Directory: 4.2/alpine3.19
-Tags: 4.2.5-bullseye, 4.2-bullseye
+Tags: 4.2.5-bookworm, 4.2-bookworm
SharedTags: 4.2.5, 4.2
Architectures: amd64, arm32v7, arm64v8
-GitCommit: 5a0bf6fd06e6c8ec052cf0a2bbd83b39932a1839
-Directory: 4.2/bullseye
+GitCommit: 1cff33784d835b54074b7befa1ee159877ede9bf
+Directory: 4.2/bookworm
-Tags: 4.2.5-buster, 4.2-buster
+Tags: 4.2.5-bullseye, 4.2-bullseye
Architectures: amd64, arm32v7, arm64v8
GitCommit: 5a0bf6fd06e6c8ec052cf0a2bbd83b39932a1839
-Directory: 4.2/buster
+Directory: 4.2/bullseye
Tags: 4.2.5-windowsservercore-1809, 4.2-windowsservercore-1809
SharedTags: 4.2.5-windowsservercore, 4.2-windowsservercore, 4.2.5, 4.2
@@ -156,16 +146,16 @@ Architectures: amd64, arm64v8
GitCommit: 882ff89f78244a8a5b05faaf7d4fe9933528f6ca
Directory: 4.3/alpine3.19
-Tags: 4.3.4-bullseye, 4.3-bullseye
+Tags: 4.3.4-bookworm, 4.3-bookworm
SharedTags: 4.3.4, 4.3, latest
Architectures: amd64, arm32v7, arm64v8
-GitCommit: 882ff89f78244a8a5b05faaf7d4fe9933528f6ca
-Directory: 4.3/bullseye
+GitCommit: 1cff33784d835b54074b7befa1ee159877ede9bf
+Directory: 4.3/bookworm
-Tags: 4.3.4-buster, 4.3-buster
+Tags: 4.3.4-bullseye, 4.3-bullseye
Architectures: amd64, arm32v7, arm64v8
GitCommit: 882ff89f78244a8a5b05faaf7d4fe9933528f6ca
-Directory: 4.3/buster
+Directory: 4.3/bullseye
Tags: 4.3.4-windowsservercore-1809, 4.3-windowsservercore-1809
SharedTags: 4.3.4-windowsservercore, 4.3-windowsservercore, 4.3.4, 4.3, latest
diff --git a/_bashbrew-list b/_bashbrew-list
index d5aff10..75f5001 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -5,7 +5,6 @@ haxe:4.0-alpine3.17
haxe:4.0-alpine3.18
haxe:4.0-alpine3.19
haxe:4.0-bullseye
-haxe:4.0-buster
haxe:4.0-windowsservercore
haxe:4.0-windowsservercore-1809
haxe:4.0-windowsservercore-ltsc2022
@@ -16,7 +15,6 @@ haxe:4.0.5-alpine3.17
haxe:4.0.5-alpine3.18
haxe:4.0.5-alpine3.19
haxe:4.0.5-bullseye
-haxe:4.0.5-buster
haxe:4.0.5-windowsservercore
haxe:4.0.5-windowsservercore-1809
haxe:4.0.5-windowsservercore-ltsc2022
@@ -27,7 +25,6 @@ haxe:4.1-alpine3.17
haxe:4.1-alpine3.18
haxe:4.1-alpine3.19
haxe:4.1-bullseye
-haxe:4.1-buster
haxe:4.1-windowsservercore
haxe:4.1-windowsservercore-1809
haxe:4.1-windowsservercore-ltsc2022
@@ -38,7 +35,6 @@ haxe:4.1.5-alpine3.17
haxe:4.1.5-alpine3.18
haxe:4.1.5-alpine3.19
haxe:4.1.5-bullseye
-haxe:4.1.5-buster
haxe:4.1.5-windowsservercore
haxe:4.1.5-windowsservercore-1809
haxe:4.1.5-windowsservercore-ltsc2022
@@ -48,8 +44,8 @@ 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-buster
haxe:4.2-windowsservercore
haxe:4.2-windowsservercore-1809
haxe:4.2-windowsservercore-ltsc2022
@@ -59,8 +55,8 @@ 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-bookworm
haxe:4.2.5-bullseye
-haxe:4.2.5-buster
haxe:4.2.5-windowsservercore
haxe:4.2.5-windowsservercore-1809
haxe:4.2.5-windowsservercore-ltsc2022
@@ -70,8 +66,8 @@ 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-buster
haxe:4.3-windowsservercore
haxe:4.3-windowsservercore-1809
haxe:4.3-windowsservercore-ltsc2022
@@ -81,8 +77,8 @@ 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-bookworm
haxe:4.3.4-bullseye
-haxe:4.3.4-buster
haxe:4.3.4-windowsservercore
haxe:4.3.4-windowsservercore-1809
haxe:4.3.4-windowsservercore-ltsc2022
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index fd2aeda..39aa29a 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -3,7 +3,6 @@ haxe:4.0-alpine3.16
haxe:4.0-alpine3.17
haxe:4.0-alpine3.18
haxe:4.0-bullseye
-haxe:4.0-buster
haxe:4.0-windowsservercore-1809
haxe:4.0-windowsservercore-ltsc2022
haxe:4.1-alpine
@@ -11,22 +10,21 @@ haxe:4.1-alpine3.16
haxe:4.1-alpine3.17
haxe:4.1-alpine3.18
haxe:4.1-bullseye
-haxe:4.1-buster
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-bookworm
haxe:4.2-bullseye
-haxe:4.2-buster
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-bookworm
haxe:4.3-bullseye
-haxe:4.3-buster
haxe:4.3-windowsservercore-1809
haxe:4.3-windowsservercore-ltsc2022
diff --git a/haxe_4.0-buster/Dockerfile b/haxe_4.0-buster/Dockerfile
deleted file mode 100644
index 6396f9f..0000000
diff --git a/haxe_4.1-buster/Dockerfile b/haxe_4.1-buster/Dockerfile
deleted file mode 100644
index d46e370..0000000
diff --git a/haxe_4.2-buster/Dockerfile b/haxe_4.2-bookworm/Dockerfile
similarity index 87%
rename from haxe_4.2-buster/Dockerfile
rename to haxe_4.2-bookworm/Dockerfile
index d905dbf..1f47b5f 100644
--- a/haxe_4.2-buster/Dockerfile
+++ b/haxe_4.2-bookworm/Dockerfile
@@ -4,22 +4,22 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM buildpack-deps:buster-scm
+FROM buildpack-deps:bookworm-scm
# ensure local haxe is preferred over distribution haxe
ENV PATH /usr/local/bin:$PATH
# runtime dependencies
RUN apt-get update && apt-get install -y --no-install-recommends \
- libgc1c2 \
+ libgc1 \
zlib1g \
\
libpcre3 \
libmariadb3 \
libsqlite3-0 \
- libmbedcrypto3 \
- libmbedtls12 \
- libmbedx509-0 \
+ libmbedcrypto7 \
+ libmbedtls14 \
+ libmbedx509-1 \
&& rm -rf /var/lib/apt/lists/*
# install neko, which is a dependency of haxelib
@@ -34,7 +34,7 @@ RUN set -ex \
libpcre3-dev \
zlib1g-dev \
apache2-dev \
- libmariadb-client-lgpl-dev-compat \
+ libmariadb-dev-compat \
libsqlite3-dev \
libmbedtls-dev \
libgtk2.0-dev \
@@ -60,6 +60,10 @@ ENV HAXE_STD_PATH /usr/local/share/haxe/std
RUN set -ex \
&& buildDeps=' \
make \
+ ocaml-nox \
+ ocaml-native-compilers \
+ camlp4 \
+ ocaml-findlib \
zlib1g-dev \
libpcre3-dev \
libmbedtls-dev \
@@ -78,10 +82,10 @@ RUN set -ex \
&& cp -r std/* $HAXE_STD_PATH \
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
\
- && opam init --compiler=4.08.1 --disable-sandboxing \
+ && opam init --disable-sandboxing \
&& eval `opam env` \
\
- && ( [ -f /usr/src/haxe/opam ] || [ -f /usr/src/haxe/haxe.opam ] && opam install /usr/src/haxe --deps-only --yes || make opam_install ) \
+ && ( [ -f /usr/src/haxe/opam ] || [ -f /usr/src/haxe/haxe.opam ] && opam install /usr/src/haxe --deps-only --assume-depexts --yes || make opam_install ) \
&& make all tools \
&& mkdir -p /usr/local/bin \
&& cp haxe haxelib /usr/local/bin \
diff --git a/haxe_4.3-buster/Dockerfile b/haxe_4.3-bookworm/Dockerfile
similarity index 87%
rename from haxe_4.3-buster/Dockerfile
rename to haxe_4.3-bookworm/Dockerfile
index 622aaac..d7bd62e 100644
--- a/haxe_4.3-buster/Dockerfile
+++ b/haxe_4.3-bookworm/Dockerfile
@@ -4,22 +4,22 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM buildpack-deps:buster-scm
+FROM buildpack-deps:bookworm-scm
# ensure local haxe is preferred over distribution haxe
ENV PATH /usr/local/bin:$PATH
# runtime dependencies
RUN apt-get update && apt-get install -y --no-install-recommends \
- libgc1c2 \
+ libgc1 \
zlib1g \
libpcre2-8-0 \
libpcre3 \
libmariadb3 \
libsqlite3-0 \
- libmbedcrypto3 \
- libmbedtls12 \
- libmbedx509-0 \
+ libmbedcrypto7 \
+ libmbedtls14 \
+ libmbedx509-1 \
&& rm -rf /var/lib/apt/lists/*
# install neko, which is a dependency of haxelib
@@ -34,7 +34,7 @@ RUN set -ex \
libpcre3-dev \
zlib1g-dev \
apache2-dev \
- libmariadb-client-lgpl-dev-compat \
+ libmariadb-dev-compat \
libsqlite3-dev \
libmbedtls-dev \
libgtk2.0-dev \
@@ -60,6 +60,10 @@ ENV HAXE_STD_PATH /usr/local/share/haxe/std
RUN set -ex \
&& buildDeps=' \
make \
+ ocaml-nox \
+ ocaml-native-compilers \
+ camlp4 \
+ ocaml-findlib \
zlib1g-dev \
libpcre2-dev \
libmbedtls-dev \
@@ -78,10 +82,10 @@ RUN set -ex \
&& cp -r std/* $HAXE_STD_PATH \
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
\
- && opam init --compiler=4.08.1 --disable-sandboxing \
+ && opam init --disable-sandboxing \
&& eval `opam env` \
\
- && ( [ -f /usr/src/haxe/opam ] || [ -f /usr/src/haxe/haxe.opam ] && opam install /usr/src/haxe --deps-only --yes || make opam_install ) \
+ && ( [ -f /usr/src/haxe/opam ] || [ -f /usr/src/haxe/haxe.opam ] && opam install /usr/src/haxe --deps-only --assume-depexts --yes || make opam_install ) \
&& make all tools \
&& mkdir -p /usr/local/bin \
&& cp haxe haxelib /usr/local/bin \Relevant Maintainers:
|
|
😭 I dropped the ball: #16801 (comment) (Alpine 3.16 needs the same treatment ❤️ 👀) |
tianon
approved these changes
Jul 5, 2024
|
(also happy to wait if you'd rather roll it into this update) |
|
Oh, no problem. I'll create another PR for the alpine update. You may merge this one first. Thanks! |
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.
#17091 (comment)