Alpine 3.21.0 #18024
Merged
Alpine 3.21.0 #18024
+16
−15
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 8e37367:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 3183d44..23560dc 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,18 +1,6 @@
Maintainers: Natanael Copa <ncopa@alpinelinux.org> (@ncopa)
GitRepo: https://github.com/alpinelinux/docker-alpine.git
-Tags: 3.17.10, 3.17
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitFetch: refs/heads/v3.17
-GitCommit: 1d3ddcf4766ef6085fe6005ce3ec8ca4e6b45ddd
-amd64-Directory: x86_64
-arm32v6-Directory: armhf
-arm32v7-Directory: armv7
-arm64v8-Directory: aarch64
-i386-Directory: x86
-ppc64le-Directory: ppc64le
-s390x-Directory: s390x
-
Tags: 3.18.9, 3.18
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitFetch: refs/heads/v3.18
@@ -37,7 +25,7 @@ i386-Directory: x86
ppc64le-Directory: ppc64le
s390x-Directory: s390x
-Tags: 3.20.3, 3.20, 3, latest
+Tags: 3.20.3, 3.20
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitFetch: refs/heads/v3.20
GitCommit: 7d63673353bd39d92ba42f6effcc199aeebd45ee
@@ -50,10 +38,23 @@ ppc64le-Directory: ppc64le
riscv64-Directory: riscv64
s390x-Directory: s390x
-Tags: 20240807, edge
+Tags: 3.21.0, 3.21, 3, latest
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitFetch: refs/heads/v3.21
+GitCommit: 0f0aa5a1aae7fbaea0ac3b231dc2f99d40466420
+amd64-Directory: x86_64
+arm32v6-Directory: armhf
+arm32v7-Directory: armv7
+arm64v8-Directory: aarch64
+i386-Directory: x86
+ppc64le-Directory: ppc64le
+riscv64-Directory: riscv64
+s390x-Directory: s390x
+
+Tags: 20240923, edge
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitFetch: refs/heads/edge
-GitCommit: 35654ae14e617434d5ca29771296f6b9485eaa85
+GitCommit: 446ba06f99cf635657b51b1a5a0e81a9b8073929
amd64-Directory: x86_64
arm32v6-Directory: armhf
arm32v7-Directory: armv7
diff --git a/_bashbrew-list b/_bashbrew-list
index 49faa76..127a234 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,12 +1,12 @@
alpine:3
-alpine:3.17
-alpine:3.17.10
alpine:3.18
alpine:3.18.9
alpine:3.19
alpine:3.19.4
alpine:3.20
alpine:3.20.3
-alpine:20240807
+alpine:3.21
+alpine:3.21.0
+alpine:20240923
alpine:edge
alpine:latest
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 529ea6b..caff613 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,5 +1,5 @@
-alpine:3.17
alpine:3.18
alpine:3.19
+alpine:3.20
alpine:edge
alpine:latest
diff --git a/alpine_3.17/Dockerfile b/alpine_3.17/Dockerfile
deleted file mode 100644
index 116b37b..0000000
diff --git a/alpine_3.17/alpine-minirootfs-3.17.10-x86_64.tar.gz 'tar -t' b/alpine_3.17/alpine-minirootfs-3.17.10-x86_64.tar.gz 'tar -t'
deleted file mode 100644
index f1f98de..0000000
diff --git a/alpine_latest/Dockerfile b/alpine_3.20/Dockerfile
similarity index 100%
copy from alpine_latest/Dockerfile
copy to alpine_3.20/Dockerfile
diff --git a/alpine_latest/alpine-minirootfs-3.20.3-x86_64.tar.gz b/alpine_3.20/alpine-minirootfs-3.20.3-x86_64.tar.gz
similarity index 100%
rename from alpine_latest/alpine-minirootfs-3.20.3-x86_64.tar.gz
rename to alpine_3.20/alpine-minirootfs-3.20.3-x86_64.tar.gz
diff --git a/alpine_latest/alpine-minirootfs-3.20.3-x86_64.tar.gz 'tar -t' b/alpine_3.20/alpine-minirootfs-3.20.3-x86_64.tar.gz 'tar -t'
similarity index 100%
rename from alpine_latest/alpine-minirootfs-3.20.3-x86_64.tar.gz 'tar -t'
rename to alpine_3.20/alpine-minirootfs-3.20.3-x86_64.tar.gz 'tar -t'
diff --git a/alpine_edge/Dockerfile b/alpine_edge/Dockerfile
index 38807ba..4ab180b 100644
--- a/alpine_edge/Dockerfile
+++ b/alpine_edge/Dockerfile
@@ -1,3 +1,3 @@
FROM scratch
-ADD alpine-minirootfs-20240807-x86_64.tar.gz /
+ADD alpine-minirootfs-20240923-x86_64.tar.gz /
CMD ["/bin/sh"]
diff --git a/alpine_3.17/alpine-minirootfs-3.17.10-x86_64.tar.gz b/alpine_edge/alpine-minirootfs-20240923-x86_64.tar.gz
similarity index 32%
rename from alpine_3.17/alpine-minirootfs-3.17.10-x86_64.tar.gz
rename to alpine_edge/alpine-minirootfs-20240923-x86_64.tar.gz
index cac8ceb..7618006 100644
Binary files a/alpine_3.17/alpine-minirootfs-3.17.10-x86_64.tar.gz and b/alpine_edge/alpine-minirootfs-20240923-x86_64.tar.gz differ
diff --git a/alpine_edge/alpine-minirootfs-20240807-x86_64.tar.gz 'tar -t' b/alpine_edge/alpine-minirootfs-20240923-x86_64.tar.gz 'tar -t'
similarity index 96%
copy from alpine_edge/alpine-minirootfs-20240807-x86_64.tar.gz 'tar -t'
copy to alpine_edge/alpine-minirootfs-20240923-x86_64.tar.gz 'tar -t'
index 032c45c..e589bc3 100644
--- a/alpine_edge/alpine-minirootfs-20240807-x86_64.tar.gz 'tar -t'
+++ b/alpine_edge/alpine-minirootfs-20240923-x86_64.tar.gz 'tar -t'
@@ -174,15 +174,9 @@ lib/apk/db/triggers
lib/apk/exec/
lib/firmware/
lib/ld-musl-x86_64.so.1
-lib/libapk.so.2.14.0
lib/libc.musl-x86_64.so.1
-lib/libcrypto.so.3
-lib/libssl.so.3
-lib/libz.so.1
-lib/libz.so.1.3.1
lib/modules-load.d/
lib/sysctl.d/
-lib/sysctl.d/00-alpine.conf
media/
media/cdrom/
media/floppy/
@@ -408,11 +402,17 @@ usr/lib/engines-3/afalg.so
usr/lib/engines-3/capi.so
usr/lib/engines-3/loader_attic.so
usr/lib/engines-3/padlock.so
+usr/lib/libapk.so.2.14.0
usr/lib/libcrypto.so.3
usr/lib/libssl.so.3
+usr/lib/libz.so.1
+usr/lib/libz.so.1.3.1
usr/lib/modules-load.d/
+usr/lib/os-release
usr/lib/ossl-modules/
usr/lib/ossl-modules/legacy.so
+usr/lib/sysctl.d/
+usr/lib/sysctl.d/00-alpine.conf
usr/local/
usr/local/bin/
usr/local/lib/
@@ -468,12 +468,15 @@ usr/share/apk/keys/alpine-devel@lists.alpinelinux.org-616ac3bc.rsa.pub
usr/share/apk/keys/alpine-devel@lists.alpinelinux.org-616adfeb.rsa.pub
usr/share/apk/keys/alpine-devel@lists.alpinelinux.org-616ae350.rsa.pub
usr/share/apk/keys/alpine-devel@lists.alpinelinux.org-616db30d.rsa.pub
+usr/share/apk/keys/alpine-devel@lists.alpinelinux.org-66ba20fe.rsa.pub
usr/share/apk/keys/armhf/
usr/share/apk/keys/armhf/alpine-devel@lists.alpinelinux.org-524d27bb.rsa.pub
usr/share/apk/keys/armhf/alpine-devel@lists.alpinelinux.org-616a9724.rsa.pub
usr/share/apk/keys/armv7/
usr/share/apk/keys/armv7/alpine-devel@lists.alpinelinux.org-524d27bb.rsa.pub
usr/share/apk/keys/armv7/alpine-devel@lists.alpinelinux.org-616adfeb.rsa.pub
+usr/share/apk/keys/loongarch64/
+usr/share/apk/keys/loongarch64/alpine-devel@lists.alpinelinux.org-66ba20fe.rsa.pub
usr/share/apk/keys/mips64/
usr/share/apk/keys/mips64/alpine-devel@lists.alpinelinux.org-5e69ca50.rsa.pub
usr/share/apk/keys/ppc64le/
diff --git a/alpine_latest/Dockerfile b/alpine_latest/Dockerfile
index dbd3e5b..5901343 100644
--- a/alpine_latest/Dockerfile
+++ b/alpine_latest/Dockerfile
@@ -1,3 +1,3 @@
FROM scratch
-ADD alpine-minirootfs-3.20.3-x86_64.tar.gz /
+ADD alpine-minirootfs-3.21.0-x86_64.tar.gz /
CMD ["/bin/sh"]
diff --git a/alpine_edge/alpine-minirootfs-20240807-x86_64.tar.gz b/alpine_latest/alpine-minirootfs-3.21.0-x86_64.tar.gz
similarity index 34%
rename from alpine_edge/alpine-minirootfs-20240807-x86_64.tar.gz
rename to alpine_latest/alpine-minirootfs-3.21.0-x86_64.tar.gz
index 0dd4218..9c52471 100644
Binary files a/alpine_edge/alpine-minirootfs-20240807-x86_64.tar.gz and b/alpine_latest/alpine-minirootfs-3.21.0-x86_64.tar.gz differ
diff --git a/alpine_edge/alpine-minirootfs-20240807-x86_64.tar.gz 'tar -t' b/alpine_latest/alpine-minirootfs-3.21.0-x86_64.tar.gz 'tar -t'
similarity index 96%
rename from alpine_edge/alpine-minirootfs-20240807-x86_64.tar.gz 'tar -t'
rename to alpine_latest/alpine-minirootfs-3.21.0-x86_64.tar.gz 'tar -t'
index 032c45c..e589bc3 100644
--- a/alpine_edge/alpine-minirootfs-20240807-x86_64.tar.gz 'tar -t'
+++ b/alpine_latest/alpine-minirootfs-3.21.0-x86_64.tar.gz 'tar -t'
@@ -174,15 +174,9 @@ lib/apk/db/triggers
lib/apk/exec/
lib/firmware/
lib/ld-musl-x86_64.so.1
-lib/libapk.so.2.14.0
lib/libc.musl-x86_64.so.1
-lib/libcrypto.so.3
-lib/libssl.so.3
-lib/libz.so.1
-lib/libz.so.1.3.1
lib/modules-load.d/
lib/sysctl.d/
-lib/sysctl.d/00-alpine.conf
media/
media/cdrom/
media/floppy/
@@ -408,11 +402,17 @@ usr/lib/engines-3/afalg.so
usr/lib/engines-3/capi.so
usr/lib/engines-3/loader_attic.so
usr/lib/engines-3/padlock.so
+usr/lib/libapk.so.2.14.0
usr/lib/libcrypto.so.3
usr/lib/libssl.so.3
+usr/lib/libz.so.1
+usr/lib/libz.so.1.3.1
usr/lib/modules-load.d/
+usr/lib/os-release
usr/lib/ossl-modules/
usr/lib/ossl-modules/legacy.so
+usr/lib/sysctl.d/
+usr/lib/sysctl.d/00-alpine.conf
usr/local/
usr/local/bin/
usr/local/lib/
@@ -468,12 +468,15 @@ usr/share/apk/keys/alpine-devel@lists.alpinelinux.org-616ac3bc.rsa.pub
usr/share/apk/keys/alpine-devel@lists.alpinelinux.org-616adfeb.rsa.pub
usr/share/apk/keys/alpine-devel@lists.alpinelinux.org-616ae350.rsa.pub
usr/share/apk/keys/alpine-devel@lists.alpinelinux.org-616db30d.rsa.pub
+usr/share/apk/keys/alpine-devel@lists.alpinelinux.org-66ba20fe.rsa.pub
usr/share/apk/keys/armhf/
usr/share/apk/keys/armhf/alpine-devel@lists.alpinelinux.org-524d27bb.rsa.pub
usr/share/apk/keys/armhf/alpine-devel@lists.alpinelinux.org-616a9724.rsa.pub
usr/share/apk/keys/armv7/
usr/share/apk/keys/armv7/alpine-devel@lists.alpinelinux.org-524d27bb.rsa.pub
usr/share/apk/keys/armv7/alpine-devel@lists.alpinelinux.org-616adfeb.rsa.pub
+usr/share/apk/keys/loongarch64/
+usr/share/apk/keys/loongarch64/alpine-devel@lists.alpinelinux.org-66ba20fe.rsa.pub
usr/share/apk/keys/mips64/
usr/share/apk/keys/mips64/alpine-devel@lists.alpinelinux.org-5e69ca50.rsa.pub
usr/share/apk/keys/ppc64le/Relevant Maintainers:
|
This was referenced Dec 5, 2024
yosifkit
approved these changes
Dec 5, 2024
|
FYI affected maintainers for the Alpine 3.17 EOL/removal:
Please either drop the affected tags from the supported list (by removing them from your (Also, if you're not supposed to be in this list, or you're getting this forwarded to you and you are supposed to be in this list, please update the |
andyli
added a commit
to HaxeFoundation/docker-library-haxe
that referenced
this pull request
Dec 9, 2024
#18093 for |
|
#18124 fixes this for amazonlinux |
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.
also include edge snapshot 20240923 from #17607