Skip to content

Conversation

@ncopa
Copy link
Contributor

@ncopa ncopa commented May 9, 2023

No description provided.

@github-actions
Copy link

github-actions bot commented May 9, 2023

Diff for 2a6e1df:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 1f53d14..8d7279d 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.14.10, 3.14
+Tags: 3.15.8, 3.15
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitFetch: refs/heads/v3.14
-GitCommit: cb8d8712f672bfa9a8b9a1f64b2c12f369f1cc68
+GitFetch: refs/heads/v3.15
+GitCommit: d5bee21392df6b1e0b491cee3f3436121238a178
 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.15.8, 3.15
+Tags: 3.16.5, 3.16
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitFetch: refs/heads/v3.15
-GitCommit: d5bee21392df6b1e0b491cee3f3436121238a178
+GitFetch: refs/heads/v3.16
+GitCommit: 8abeb7449b58d28e108a027990013f56845bdea4
 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.16.5, 3.16
+Tags: 3.17.3, 3.17
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitFetch: refs/heads/v3.16
-GitCommit: 8abeb7449b58d28e108a027990013f56845bdea4
+GitFetch: refs/heads/v3.17
+GitCommit: 681b8c677aaed66e48a5ce721509647bd4dcd017
 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.17.3, 3.17, 3, latest
+Tags: 3.18.0, 3.18, 3, latest
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitFetch: refs/heads/v3.17
-GitCommit: 681b8c677aaed66e48a5ce721509647bd4dcd017
+GitFetch: refs/heads/v3.18
+GitCommit: 571516c7ce3ecec3c70541d13529a4abb33ba362
 amd64-Directory: x86_64
 arm32v6-Directory: armhf
 arm32v7-Directory: armv7
diff --git a/_bashbrew-list b/_bashbrew-list
index d8501da..18b2a99 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,12 +1,12 @@
 alpine:3
-alpine:3.14
-alpine:3.14.10
 alpine:3.15
 alpine:3.15.8
 alpine:3.16
 alpine:3.16.5
 alpine:3.17
 alpine:3.17.3
+alpine:3.18
+alpine:3.18.0
 alpine:20230329
 alpine:edge
 alpine:latest
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 942f386..2b62f33 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,5 +1,5 @@
-alpine:3.14
 alpine:3.15
 alpine:3.16
+alpine:3.17
 alpine:latest
 alpine:edge
diff --git a/alpine_3.14/Dockerfile b/alpine_3.14/Dockerfile
deleted file mode 100644
index eb69b75..0000000
diff --git a/alpine_3.14/alpine-minirootfs-3.14.10-x86_64.tar.gz b/alpine_3.14/alpine-minirootfs-3.14.10-x86_64.tar.gz
deleted file mode 100644
index 43f9f88..0000000
diff --git a/alpine_latest/Dockerfile b/alpine_3.17/Dockerfile
similarity index 100%
copy from alpine_latest/Dockerfile
copy to alpine_3.17/Dockerfile
diff --git a/alpine_latest/alpine-minirootfs-3.17.3-x86_64.tar.gz b/alpine_3.17/alpine-minirootfs-3.17.3-x86_64.tar.gz
similarity index 100%
copy from alpine_latest/alpine-minirootfs-3.17.3-x86_64.tar.gz
copy to alpine_3.17/alpine-minirootfs-3.17.3-x86_64.tar.gz
diff --git a/alpine_latest/alpine-minirootfs-3.17.3-x86_64.tar.gz  'tar -t' b/alpine_3.17/alpine-minirootfs-3.17.3-x86_64.tar.gz  'tar -t'
similarity index 100%
rename from alpine_latest/alpine-minirootfs-3.17.3-x86_64.tar.gz  'tar -t'
rename to alpine_3.17/alpine-minirootfs-3.17.3-x86_64.tar.gz  'tar -t'
diff --git a/alpine_latest/Dockerfile b/alpine_latest/Dockerfile
index 041d0b0..eb9d46f 100644
--- a/alpine_latest/Dockerfile
+++ b/alpine_latest/Dockerfile
@@ -1,3 +1,3 @@
 FROM scratch
-ADD alpine-minirootfs-3.17.3-x86_64.tar.gz /
+ADD alpine-minirootfs-3.18.0-x86_64.tar.gz /
 CMD ["/bin/sh"]
diff --git a/alpine_latest/alpine-minirootfs-3.17.3-x86_64.tar.gz b/alpine_latest/alpine-minirootfs-3.18.0-x86_64.tar.gz
similarity index 33%
rename from alpine_latest/alpine-minirootfs-3.17.3-x86_64.tar.gz
rename to alpine_latest/alpine-minirootfs-3.18.0-x86_64.tar.gz
index 341711c..21c46d9 100644
Binary files a/alpine_latest/alpine-minirootfs-3.17.3-x86_64.tar.gz and b/alpine_latest/alpine-minirootfs-3.18.0-x86_64.tar.gz differ
diff --git a/alpine_3.14/alpine-minirootfs-3.14.10-x86_64.tar.gz  'tar -t' b/alpine_latest/alpine-minirootfs-3.18.0-x86_64.tar.gz  'tar -t'
similarity index 93%
rename from alpine_3.14/alpine-minirootfs-3.14.10-x86_64.tar.gz  'tar -t'
rename to alpine_latest/alpine-minirootfs-3.18.0-x86_64.tar.gz  'tar -t'
index 72fc881..9978351 100644
--- a/alpine_3.14/alpine-minirootfs-3.14.10-x86_64.tar.gz  'tar -t'	
+++ b/alpine_latest/alpine-minirootfs-3.18.0-x86_64.tar.gz  'tar -t'	
@@ -6,6 +6,7 @@ bin/base64
 bin/bbconfig
 bin/busybox
 bin/cat
+bin/chattr
 bin/chgrp
 bin/chmod
 bin/chown
@@ -40,6 +41,7 @@ bin/linux64
 bin/ln
 bin/login
 bin/ls
+bin/lsattr
 bin/lzop
 bin/makemime
 bin/mkdir
@@ -93,8 +95,11 @@ etc/apk/keys/alpine-devel@lists.alpinelinux.org-5261cecb.rsa.pub
 etc/apk/keys/alpine-devel@lists.alpinelinux.org-6165ee59.rsa.pub
 etc/apk/keys/alpine-devel@lists.alpinelinux.org-61666e3f.rsa.pub
 etc/apk/protected_paths.d/
+etc/apk/protected_paths.d/alpine-release.list
 etc/apk/repositories
 etc/apk/world
+etc/busybox-paths.d/
+etc/busybox-paths.d/busybox
 etc/conf.d/
 etc/crontabs/
 etc/crontabs/root
@@ -124,6 +129,7 @@ etc/network/if-pre-down.d/
 etc/network/if-pre-up.d/
 etc/network/if-up.d/
 etc/network/if-up.d/dad
+etc/nsswitch.conf
 etc/opt/
 etc/os-release
 etc/passwd
@@ -135,10 +141,12 @@ etc/periodic/monthly/
 etc/periodic/weekly/
 etc/profile
 etc/profile.d/
+etc/profile.d/20locale.sh
 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
@@ -156,6 +164,9 @@ etc/ssl/misc/tsget.pl
 etc/ssl/openssl.cnf
 etc/ssl/openssl.cnf.dist
 etc/ssl/private/
+etc/ssl1.1/
+etc/ssl1.1/cert.pem
+etc/ssl1.1/certs
 etc/sysctl.conf
 etc/sysctl.d/
 etc/udhcpd.conf
@@ -167,14 +178,15 @@ lib/apk/db/installed
 lib/apk/db/lock
 lib/apk/db/scripts.tar
 lib/apk/db/triggers
+lib/apk/exec/
 lib/firmware/
 lib/ld-musl-x86_64.so.1
-lib/libapk.so.3.12.0
+lib/libapk.so.2.14.0
 lib/libc.musl-x86_64.so.1
-lib/libcrypto.so.1.1
-lib/libssl.so.1.1
+lib/libcrypto.so.3
+lib/libssl.so.3
 lib/libz.so.1
-lib/libz.so.1.2.12
+lib/libz.so.1.2.13
 lib/mdev/
 lib/modules-load.d/
 lib/sysctl.d/
@@ -227,7 +239,6 @@ sbin/lsmod
 sbin/mdev
 sbin/mkdosfs
 sbin/mkfs.vfat
-sbin/mkmntdirs
 sbin/mkswap
 sbin/modinfo
 sbin/modprobe
@@ -250,6 +261,7 @@ sbin/tunctl
 sbin/udhcpc
 sbin/vconfig
 sbin/watchdog
+sbin/zcip
 srv/
 sys/
 tmp/
@@ -305,6 +317,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
@@ -367,6 +380,7 @@ usr/bin/top
 usr/bin/tr
 usr/bin/traceroute
 usr/bin/traceroute6
+usr/bin/tree
 usr/bin/truncate
 usr/bin/tty
 usr/bin/ttysize
@@ -389,6 +403,7 @@ usr/bin/volname
 usr/bin/wc
 usr/bin/wget
 usr/bin/which
+usr/bin/who
 usr/bin/whoami
 usr/bin/whois
 usr/bin/xargs
@@ -396,15 +411,16 @@ usr/bin/xxd
 usr/bin/xzcat
 usr/bin/yes
 usr/lib/
-usr/lib/engines-1.1/
-usr/lib/engines-1.1/afalg.so
-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.so.2
-usr/lib/libtls.so.2.0.3
+usr/lib/engines-3/
+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/libcrypto.so.3
+usr/lib/libssl.so.3
 usr/lib/modules-load.d/
+usr/lib/ossl-modules/
+usr/lib/ossl-modules/legacy.so
 usr/local/
 usr/local/bin/
 usr/local/lib/

Relevant Maintainers:

@yosifkit
Copy link
Member

yosifkit commented May 9, 2023

FYI affected maintainers. alpine:3.14 is being removed from "Supported Images" since it has reached end of life, so official images FROM it need to be updated (like to a newer Alpine release) or should be removed as well.

Removing an image from the library/[image] files will remove it from the "Supported" section on the Hub readme (and will prevent us from spending cycles rebuilding it on the official build server), but the tag will still be available to users who want it.

andyli added a commit to HaxeFoundation/docker-library-haxe that referenced this pull request May 9, 2023
@yosifkit yosifkit merged commit b149608 into docker-library:master May 9, 2023
@ldez
Copy link
Contributor

ldez commented May 10, 2023

Hello, we will remove Traefik v1 image.

@ldez ldez mentioned this pull request May 10, 2023
andyli added a commit to andyli/official-images that referenced this pull request May 10, 2023
@KVS85
Copy link
Contributor

KVS85 commented May 10, 2023

Hello, we moved Alpine to 3.15 for ArangoDB 3.9: #14621.

@ralight
Copy link
Contributor

ralight commented May 13, 2023

eclipse-mosquitto is fixed as per #14645

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.

5 participants