Skip to content
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

alpine: add 3.20.0 as latest #16801

Merged
merged 1 commit into from
May 22, 2024
Merged

Conversation

ncopa
Copy link
Contributor

@ncopa ncopa commented May 22, 2024

Also remove the EOL 3.16

Also remove the EOL 3.16
@ncopa ncopa requested a review from a team as a code owner May 22, 2024 11:45
Copy link

Diff for 006d50e:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 0bf3ed7..8aa0027 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.16.9, 3.16
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitFetch: refs/heads/v3.16
-GitCommit: 9c372c82f691cfe76c2058d75e2c4f9cd589d4c5
-amd64-Directory: x86_64
-arm32v6-Directory: armhf
-arm32v7-Directory: armv7
-arm64v8-Directory: aarch64
-i386-Directory: x86
-ppc64le-Directory: ppc64le
-s390x-Directory: s390x
-
 Tags: 3.17.7, 3.17
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitFetch: refs/heads/v3.17
@@ -37,7 +25,7 @@ i386-Directory: x86
 ppc64le-Directory: ppc64le
 s390x-Directory: s390x
 
-Tags: 3.19.1, 3.19, 3, latest
+Tags: 3.19.1, 3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitFetch: refs/heads/v3.19
 GitCommit: 7385303148c97ef32a3f225ec03bafa46b689d12
@@ -49,6 +37,19 @@ i386-Directory: x86
 ppc64le-Directory: ppc64le
 s390x-Directory: s390x
 
+Tags: 3.20.0, 3.20, 3, latest
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitFetch: refs/heads/v3.20
+GitCommit: 142830f310291a58bea7294cc17ed645697861ca
+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: 20240329, edge
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitFetch: refs/heads/edge
diff --git a/_bashbrew-list b/_bashbrew-list
index deac3f8..a57c7f2 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,12 +1,12 @@
 alpine:3
-alpine:3.16
-alpine:3.16.9
 alpine:3.17
 alpine:3.17.7
 alpine:3.18
 alpine:3.18.6
 alpine:3.19
 alpine:3.19.1
+alpine:3.20
+alpine:3.20.0
 alpine:20240329
 alpine:edge
 alpine:latest
diff --git a/alpine_3.16/Dockerfile b/alpine_3.16/Dockerfile
deleted file mode 100644
index 880b57a..0000000
diff --git a/alpine_3.16/alpine-minirootfs-3.16.9-x86_64.tar.gz b/alpine_3.16/alpine-minirootfs-3.16.9-x86_64.tar.gz
deleted file mode 100644
index a5e311e..0000000
diff --git a/alpine_3.16/alpine-minirootfs-3.16.9-x86_64.tar.gz  'tar -t' b/alpine_3.16/alpine-minirootfs-3.16.9-x86_64.tar.gz  'tar -t'
deleted file mode 100644
index af72cc6..0000000
diff --git a/alpine_latest/Dockerfile b/alpine_3.19/Dockerfile
similarity index 100%
copy from alpine_latest/Dockerfile
copy to alpine_3.19/Dockerfile
diff --git a/alpine_latest/alpine-minirootfs-3.19.1-x86_64.tar.gz b/alpine_3.19/alpine-minirootfs-3.19.1-x86_64.tar.gz
similarity index 100%
rename from alpine_latest/alpine-minirootfs-3.19.1-x86_64.tar.gz
rename to alpine_3.19/alpine-minirootfs-3.19.1-x86_64.tar.gz
diff --git a/alpine_latest/alpine-minirootfs-3.19.1-x86_64.tar.gz  'tar -t' b/alpine_3.19/alpine-minirootfs-3.19.1-x86_64.tar.gz  'tar -t'
similarity index 100%
rename from alpine_latest/alpine-minirootfs-3.19.1-x86_64.tar.gz  'tar -t'
rename to alpine_3.19/alpine-minirootfs-3.19.1-x86_64.tar.gz  'tar -t'
diff --git a/alpine_latest/Dockerfile b/alpine_latest/Dockerfile
index dbf2b04..9eee240 100644
--- a/alpine_latest/Dockerfile
+++ b/alpine_latest/Dockerfile
@@ -1,3 +1,3 @@
 FROM scratch
-ADD alpine-minirootfs-3.19.1-x86_64.tar.gz /
+ADD alpine-minirootfs-3.20.0-x86_64.tar.gz /
 CMD ["/bin/sh"]
diff --git a/alpine_edge/alpine-minirootfs-20240329-x86_64.tar.gz b/alpine_latest/alpine-minirootfs-3.20.0-x86_64.tar.gz
similarity index 33%
copy from alpine_edge/alpine-minirootfs-20240329-x86_64.tar.gz
copy to alpine_latest/alpine-minirootfs-3.20.0-x86_64.tar.gz
index 346ab42..69f5dd0 100644
Binary files a/alpine_edge/alpine-minirootfs-20240329-x86_64.tar.gz and b/alpine_latest/alpine-minirootfs-3.20.0-x86_64.tar.gz differ
diff --git a/alpine_edge/alpine-minirootfs-20240329-x86_64.tar.gz  'tar -t' b/alpine_latest/alpine-minirootfs-3.20.0-x86_64.tar.gz  'tar -t'
similarity index 100%
copy from alpine_edge/alpine-minirootfs-20240329-x86_64.tar.gz  'tar -t'
copy to alpine_latest/alpine-minirootfs-3.20.0-x86_64.tar.gz  'tar -t'

Relevant Maintainers:

@yosifkit yosifkit merged commit da95c4e into docker-library:master May 22, 2024
10 checks passed
@tianon
Copy link
Member

tianon commented Jul 5, 2024

Doh, sorry, we missed an EOL notification here! FYI affected maintainers for the Alpine 3.16 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.

4 participants