alpine: add 3.16.0 as latest, drop EOL 3.12 #12477
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 6675d08:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 92a18cd..3a7daee 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,10 +1,10 @@
Maintainers: Natanael Copa <ncopa@alpinelinux.org> (@ncopa)
GitRepo: https://github.com/alpinelinux/docker-alpine.git
-Tags: 3.12.12, 3.12
+Tags: 3.13.10, 3.13
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitFetch: refs/heads/v3.12
-GitCommit: 0cc7fea5828303fa14d754bab4f9161a8cac4ba1
+GitFetch: refs/heads/v3.13
+GitCommit: 52cb02afe883694d7b711735e66e1a08fb139011
amd64-Directory: x86_64
arm32v6-Directory: armhf
arm32v7-Directory: armv7
@@ -13,10 +13,10 @@ i386-Directory: x86
ppc64le-Directory: ppc64le
s390x-Directory: s390x
-Tags: 3.13.10, 3.13
+Tags: 3.14.6, 3.14
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitFetch: refs/heads/v3.13
-GitCommit: 52cb02afe883694d7b711735e66e1a08fb139011
+GitFetch: refs/heads/v3.14
+GitCommit: acdada9286850d1b48abd8944ca4f8f8ea909372
amd64-Directory: x86_64
arm32v6-Directory: armhf
arm32v7-Directory: armv7
@@ -25,10 +25,10 @@ i386-Directory: x86
ppc64le-Directory: ppc64le
s390x-Directory: s390x
-Tags: 3.14.6, 3.14
+Tags: 3.15.4, 3.15
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitFetch: refs/heads/v3.14
-GitCommit: acdada9286850d1b48abd8944ca4f8f8ea909372
+GitFetch: refs/heads/v3.15
+GitCommit: fc965e3222f368bea8e07c1c1da70b6928281a76
amd64-Directory: x86_64
arm32v6-Directory: armhf
arm32v7-Directory: armv7
@@ -37,10 +37,10 @@ i386-Directory: x86
ppc64le-Directory: ppc64le
s390x-Directory: s390x
-Tags: 3.15.4, 3.15, 3, latest
+Tags: 3.16.0, 3.16, 3, latest
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitFetch: refs/heads/v3.15
-GitCommit: fc965e3222f368bea8e07c1c1da70b6928281a76
+GitFetch: refs/heads/v3.16
+GitCommit: c9515859c035acbb899c6738506954e36f57e7dc
amd64-Directory: x86_64
arm32v6-Directory: armhf
arm32v7-Directory: armv7
diff --git a/_bashbrew-list b/_bashbrew-list
index 0ef291f..6cd8643 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,12 +1,12 @@
alpine:3
-alpine:3.12
-alpine:3.12.12
alpine:3.13
alpine:3.13.10
alpine:3.14
alpine:3.14.6
alpine:3.15
alpine:3.15.4
+alpine:3.16
+alpine:3.16.0
alpine:20220328
alpine:edge
alpine:latest
diff --git a/alpine_3.12/Dockerfile b/alpine_3.12/Dockerfile
deleted file mode 100644
index 21afc1a..0000000
diff --git a/alpine_3.12/alpine-minirootfs-3.12.12-x86_64.tar.gz b/alpine_3.12/alpine-minirootfs-3.12.12-x86_64.tar.gz
deleted file mode 100644
index 8f829be..0000000
diff --git a/alpine_latest/Dockerfile b/alpine_3.15/Dockerfile
similarity index 100%
copy from alpine_latest/Dockerfile
copy to alpine_3.15/Dockerfile
diff --git a/alpine_latest/alpine-minirootfs-3.15.4-x86_64.tar.gz b/alpine_3.15/alpine-minirootfs-3.15.4-x86_64.tar.gz
similarity index 100%
rename from alpine_latest/alpine-minirootfs-3.15.4-x86_64.tar.gz
rename to alpine_3.15/alpine-minirootfs-3.15.4-x86_64.tar.gz
diff --git a/alpine_latest/alpine-minirootfs-3.15.4-x86_64.tar.gz 'tar -t' b/alpine_3.15/alpine-minirootfs-3.15.4-x86_64.tar.gz 'tar -t'
similarity index 100%
rename from alpine_latest/alpine-minirootfs-3.15.4-x86_64.tar.gz 'tar -t'
rename to alpine_3.15/alpine-minirootfs-3.15.4-x86_64.tar.gz 'tar -t'
diff --git a/alpine_latest/Dockerfile b/alpine_latest/Dockerfile
index f125307..636f35f 100644
--- a/alpine_latest/Dockerfile
+++ b/alpine_latest/Dockerfile
@@ -1,3 +1,3 @@
FROM scratch
-ADD alpine-minirootfs-3.15.4-x86_64.tar.gz /
+ADD alpine-minirootfs-3.16.0-x86_64.tar.gz /
CMD ["/bin/sh"]
diff --git a/alpine_edge/alpine-minirootfs-20220328-x86_64.tar.gz b/alpine_latest/alpine-minirootfs-3.16.0-x86_64.tar.gz
similarity index 30%
copy from alpine_edge/alpine-minirootfs-20220328-x86_64.tar.gz
copy to alpine_latest/alpine-minirootfs-3.16.0-x86_64.tar.gz
index 02b79fb..17f4ba0 100644
Binary files a/alpine_edge/alpine-minirootfs-20220328-x86_64.tar.gz and b/alpine_latest/alpine-minirootfs-3.16.0-x86_64.tar.gz differ
diff --git a/alpine_3.12/alpine-minirootfs-3.12.12-x86_64.tar.gz 'tar -t' b/alpine_latest/alpine-minirootfs-3.16.0-x86_64.tar.gz 'tar -t'
similarity index 97%
rename from alpine_3.12/alpine-minirootfs-3.12.12-x86_64.tar.gz 'tar -t'
rename to alpine_latest/alpine-minirootfs-3.16.0-x86_64.tar.gz 'tar -t'
index 90099c7..6d6c873 100644
--- a/alpine_3.12/alpine-minirootfs-3.12.12-x86_64.tar.gz 'tar -t'
+++ b/alpine_latest/alpine-minirootfs-3.16.0-x86_64.tar.gz 'tar -t'
@@ -6,10 +6,10 @@ bin/base64
bin/bbconfig
bin/busybox
bin/cat
+bin/chattr
bin/chgrp
bin/chmod
bin/chown
-bin/conspy
bin/cp
bin/date
bin/dd
@@ -41,6 +41,7 @@ bin/linux64
bin/ln
bin/login
bin/ls
+bin/lsattr
bin/lzop
bin/makemime
bin/mkdir
@@ -136,9 +137,12 @@ etc/periodic/monthly/
etc/periodic/weekly/
etc/profile
etc/profile.d/
-etc/profile.d/color_prompt
+etc/profile.d/README
+etc/profile.d/color_prompt.sh.disabled
etc/profile.d/locale.sh
etc/protocols
+etc/secfixes.d/
+etc/secfixes.d/alpine
etc/securetty
etc/services
etc/shadow
@@ -169,6 +173,7 @@ lib/apk/db/scripts.tar
lib/apk/db/triggers
lib/firmware/
lib/ld-musl-x86_64.so.1
+lib/libapk.so.3.12.0
lib/libc.musl-x86_64.so.1
lib/libcrypto.so.1.1
lib/libssl.so.1.1
@@ -202,7 +207,6 @@ sbin/fsck
sbin/fstrim
sbin/getty
sbin/halt
-sbin/hdparm
sbin/hwclock
sbin/ifconfig
sbin/ifdown
@@ -281,7 +285,6 @@ usr/bin/diff
usr/bin/dirname
usr/bin/dos2unix
usr/bin/du
-usr/bin/dumpleases
usr/bin/eject
usr/bin/env
usr/bin/expand
@@ -306,6 +309,7 @@ usr/bin/install
usr/bin/ipcrm
usr/bin/ipcs
usr/bin/killall
+usr/bin/last
usr/bin/ldd
usr/bin/less
usr/bin/logger
@@ -353,7 +357,6 @@ usr/bin/sha512sum
usr/bin/showkey
usr/bin/shred
usr/bin/shuf
-usr/bin/smemcap
usr/bin/sort
usr/bin/split
usr/bin/ssl_client
@@ -391,11 +394,11 @@ usr/bin/volname
usr/bin/wc
usr/bin/wget
usr/bin/which
+usr/bin/who
usr/bin/whoami
usr/bin/whois
usr/bin/xargs
usr/bin/xxd
-usr/bin/xz
usr/bin/xzcat
usr/bin/yes
usr/lib/
@@ -405,8 +408,6 @@ usr/lib/engines-1.1/capi.so
usr/lib/engines-1.1/padlock.so
usr/lib/libcrypto.so.1.1
usr/lib/libssl.so.1.1
-usr/lib/libtls-standalone.so.1
-usr/lib/libtls-standalone.so.1.0.0
usr/lib/modules-load.d/
usr/local/
usr/local/bin/
@@ -425,20 +426,16 @@ usr/sbin/delgroup
usr/sbin/deluser
usr/sbin/ether-wake
usr/sbin/fbset
-usr/sbin/fdformat
usr/sbin/killall5
usr/sbin/loadfont
-usr/sbin/lspci
usr/sbin/nanddump
usr/sbin/nandwrite
usr/sbin/nbd-client
usr/sbin/ntpd
usr/sbin/partprobe
-usr/sbin/powertop
usr/sbin/rdate
usr/sbin/rdev
usr/sbin/readahead
-usr/sbin/readprofile
usr/sbin/remove-shell
usr/sbin/rfkill
usr/sbin/sendmailRelevant Maintainers:
|
|
FYI affected maintainers:
|
tklauser
added a commit
to cilium/cilium
that referenced
this pull request
Jul 4, 2022
Since alpine 3.12 is EOL and was recently dropped from docker official images [1], update our images to alpine 3.16.0 which is currently the most recent version. [1] docker-library/official-images#12477 The comment about nslookup stems from PR #15950, but none of the images seem to use nslookup. We only use these images for ca-certificates and python/bash, respectively. Signed-off-by: Tobias Klauser <tobias@cilium.io>
qmonnet
pushed a commit
to cilium/cilium
that referenced
this pull request
Jul 6, 2022
Since alpine 3.12 is EOL and was recently dropped from docker official images [1], update our images to alpine 3.16.0 which is currently the most recent version. [1] docker-library/official-images#12477 The comment about nslookup stems from PR #15950, but none of the images seem to use nslookup. We only use these images for ca-certificates and python/bash, respectively. Signed-off-by: Tobias Klauser <tobias@cilium.io>
ldelossa
pushed a commit
to ldelossa/cilium
that referenced
this pull request
Jul 13, 2022
[ upstream commit 7e07d55 ] Since alpine 3.12 is EOL and was recently dropped from docker official images [1], update our images to alpine 3.16.0 which is currently the most recent version. [1] docker-library/official-images#12477 The comment about nslookup stems from PR cilium#15950, but none of the images seem to use nslookup. We only use these images for ca-certificates and python/bash, respectively. Signed-off-by: Tobias Klauser <tobias@cilium.io> Signed-off-by: Louis DeLosSantos <louis.delos@isovalent.com>
aanm
pushed a commit
to cilium/cilium
that referenced
this pull request
Jul 14, 2022
[ upstream commit 7e07d55 ] Since alpine 3.12 is EOL and was recently dropped from docker official images [1], update our images to alpine 3.16.0 which is currently the most recent version. [1] docker-library/official-images#12477 The comment about nslookup stems from PR #15950, but none of the images seem to use nslookup. We only use these images for ca-certificates and python/bash, respectively. Signed-off-by: Tobias Klauser <tobias@cilium.io> Signed-off-by: Louis DeLosSantos <louis.delos@isovalent.com>
dezmodue
pushed a commit
to dezmodue/cilium
that referenced
this pull request
Aug 10, 2022
Since alpine 3.12 is EOL and was recently dropped from docker official images [1], update our images to alpine 3.16.0 which is currently the most recent version. [1] docker-library/official-images#12477 The comment about nslookup stems from PR cilium#15950, but none of the images seem to use nslookup. We only use these images for ca-certificates and python/bash, respectively. Signed-off-by: Tobias Klauser <tobias@cilium.io>
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.
No description provided.