Skip to content

alpine: add 3.22.0 as latest, remove EOL 3.18 #19135

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

Merged
merged 1 commit into from
May 30, 2025

Conversation

ncopa
Copy link
Contributor

@ncopa ncopa commented May 30, 2025

Closes #19034

@ncopa ncopa requested a review from a team as a code owner May 30, 2025 16:23
Copy link

Diff for 69f9932:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 343429d..5f974f5 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.18.12, 3.18
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitFetch: refs/heads/v3.18
-GitCommit: f92f1c2b3b7025f08b05dc11b70534568a973903
-amd64-Directory: x86_64
-arm32v6-Directory: armhf
-arm32v7-Directory: armv7
-arm64v8-Directory: aarch64
-i386-Directory: x86
-ppc64le-Directory: ppc64le
-s390x-Directory: s390x
-
 Tags: 3.19.7, 3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitFetch: refs/heads/v3.19
@@ -38,7 +26,7 @@ ppc64le-Directory: ppc64le
 riscv64-Directory: riscv64
 s390x-Directory: s390x
 
-Tags: 3.21.3, 3.21, 3, latest
+Tags: 3.21.3, 3.21
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitFetch: refs/heads/v3.21
 GitCommit: 17fe3d1e2d2cbf54d745139eab749c252e35b883
@@ -51,6 +39,19 @@ ppc64le-Directory: ppc64le
 riscv64-Directory: riscv64
 s390x-Directory: s390x
 
+Tags: 3.22.0, 3.22, 3, latest
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitFetch: refs/heads/v3.22
+GitCommit: 5213c5a71c73d39d5896657909e753effb1c05ff
+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: 20250108, edge
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitFetch: refs/heads/edge
diff --git a/_bashbrew-list b/_bashbrew-list
index 00dba9c..df58a33 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,12 +1,12 @@
 alpine:3
-alpine:3.18
-alpine:3.18.12
 alpine:3.19
 alpine:3.19.7
 alpine:3.20
 alpine:3.20.6
 alpine:3.21
 alpine:3.21.3
+alpine:3.22
+alpine:3.22.0
 alpine:20250108
 alpine:edge
 alpine:latest
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index caff613..13ae9f5 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,5 +1,5 @@
-alpine:3.18
 alpine:3.19
 alpine:3.20
+alpine:3.21
 alpine:edge
 alpine:latest
diff --git a/alpine_3.18/Dockerfile b/alpine_3.18/Dockerfile
deleted file mode 100644
index e311f05..0000000
diff --git a/alpine_3.18/alpine-minirootfs-3.18.12-x86_64.tar.gz b/alpine_3.18/alpine-minirootfs-3.18.12-x86_64.tar.gz
deleted file mode 100644
index d26c367..0000000
diff --git a/alpine_3.18/alpine-minirootfs-3.18.12-x86_64.tar.gz  'tar -t' b/alpine_3.18/alpine-minirootfs-3.18.12-x86_64.tar.gz  'tar -t'
deleted file mode 100644
index c578721..0000000
diff --git a/alpine_latest/Dockerfile b/alpine_3.21/Dockerfile
similarity index 100%
copy from alpine_latest/Dockerfile
copy to alpine_3.21/Dockerfile
diff --git a/alpine_latest/alpine-minirootfs-3.21.3-x86_64.tar.gz b/alpine_3.21/alpine-minirootfs-3.21.3-x86_64.tar.gz
similarity index 100%
copy from alpine_latest/alpine-minirootfs-3.21.3-x86_64.tar.gz
copy to alpine_3.21/alpine-minirootfs-3.21.3-x86_64.tar.gz
diff --git a/alpine_latest/alpine-minirootfs-3.21.3-x86_64.tar.gz  'tar -t' b/alpine_3.21/alpine-minirootfs-3.21.3-x86_64.tar.gz  'tar -t'
similarity index 100%
copy from alpine_latest/alpine-minirootfs-3.21.3-x86_64.tar.gz  'tar -t'
copy to alpine_3.21/alpine-minirootfs-3.21.3-x86_64.tar.gz  'tar -t'
diff --git a/alpine_latest/Dockerfile b/alpine_latest/Dockerfile
index 6d5ea33..36eff17 100644
--- a/alpine_latest/Dockerfile
+++ b/alpine_latest/Dockerfile
@@ -1,3 +1,3 @@
 FROM scratch
-ADD alpine-minirootfs-3.21.3-x86_64.tar.gz /
+ADD alpine-minirootfs-3.22.0-x86_64.tar.gz /
 CMD ["/bin/sh"]
diff --git a/alpine_latest/alpine-minirootfs-3.21.3-x86_64.tar.gz b/alpine_latest/alpine-minirootfs-3.22.0-x86_64.tar.gz
similarity index 34%
rename from alpine_latest/alpine-minirootfs-3.21.3-x86_64.tar.gz
rename to alpine_latest/alpine-minirootfs-3.22.0-x86_64.tar.gz
index ea2aa3b..5f06809 100644
Binary files a/alpine_latest/alpine-minirootfs-3.21.3-x86_64.tar.gz and b/alpine_latest/alpine-minirootfs-3.22.0-x86_64.tar.gz differ
diff --git a/alpine_latest/alpine-minirootfs-3.21.3-x86_64.tar.gz  'tar -t' b/alpine_latest/alpine-minirootfs-3.22.0-x86_64.tar.gz  'tar -t'
similarity index 99%
rename from alpine_latest/alpine-minirootfs-3.21.3-x86_64.tar.gz  'tar -t'
rename to alpine_latest/alpine-minirootfs-3.22.0-x86_64.tar.gz  'tar -t'
index 182131b..d8f2f40 100644
--- a/alpine_latest/alpine-minirootfs-3.21.3-x86_64.tar.gz  'tar -t'	
+++ b/alpine_latest/alpine-minirootfs-3.22.0-x86_64.tar.gz  'tar -t'	
@@ -112,7 +112,6 @@ etc/modprobe.d/
 etc/modprobe.d/aliases.conf
 etc/modprobe.d/blacklist.conf
 etc/modprobe.d/i386.conf
-etc/modprobe.d/kms.conf
 etc/modules
 etc/modules-load.d/
 etc/motd
@@ -403,7 +402,7 @@ 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/libapk.so.2.14.9
 usr/lib/libcrypto.so.3
 usr/lib/libssl.so.3
 usr/lib/libz.so.1

Relevant Maintainers:

@yosifkit yosifkit merged commit a8c06e3 into docker-library:master May 30, 2025
10 checks passed
@tianon
Copy link
Member

tianon commented May 30, 2025

Reminder to affected maintainers for the Alpine 3.18 EOL/removal:

Please either drop the affected tags from the supported list (by removing them from your library/ file) or update them to a supported release.

(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 Maintainers: section of the relevant library/ file appropriately! 😅)

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.

Imminent Alpine 3.18 end of life
3 participants