docker-library
/
busybox
mirror of https://github.com/docker-library/busybox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to Alpine 3.20 

Now that we have stable `riscv64` in Alpine, we can also drop Alpine from all our "build from unstable" hacks 🚀
This commit is contained in:
Tianon Gravi 2024-05-22 14:53:19 -07:00
parent 97f7e4474e
commit d43ba9b8f1
17 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/munge-unstable.sh vendored
View File

@ -7,7 +7,7 @@ jq '
.matrix.include[] .matrix.include[]
| select(.name | test(" [(].+[)]") | not) # ignore any existing munged builds | select(.name | test(" [(].+[)]") | not) # ignore any existing munged builds
| select(.os | startswith("windows-") | not) | select(.os | startswith("windows-") | not)
| select(.meta.froms | any(startswith("debian:") or startswith("alpine:"))) | select(.meta.froms | any(startswith("debian:")))
| .name += " (unstable)" | .name += " (unstable)"
| .runs.prepare += ([ | .runs.prepare += ([
"./hack-unstable.sh " + (.meta.entries[].directory | @sh), "./hack-unstable.sh " + (.meta.entries[].directory | @sh),

5
Dockerfile-builder.template
View File

@ -1,5 +1,5 @@
{{ if env.variant == "musl" then ( -}} {{ if env.variant == "musl" then ( -}}
FROM alpine:3.19 FROM alpine:3.20
RUN set -eux; \ RUN set -eux; \
apk add --no-cache \ apk add --no-cache \
@ -16,9 +16,6 @@ RUN set -eux; \
# busybox's tar ironically does not maintain mtime of directories correctly (which we need for SOURCE_DATE_EPOCH / reproducibility) # busybox's tar ironically does not maintain mtime of directories correctly (which we need for SOURCE_DATE_EPOCH / reproducibility)
tar \ tar \
; ;
# https://github.com/alpinelinux/docker-alpine/issues/383
RUN set -eux; if grep -qF '/edge/' '/etc/apk/repositories'; then apk upgrade --no-cache libssl3 libcrypto3; curl --version; dirmngr --version; fi
{{ ) else ( -}} {{ ) else ( -}}
FROM debian:bookworm-slim FROM debian:bookworm-slim

1
hack-unstable.sh
View File

@ -10,5 +10,4 @@ set -x
# This is used to modify "Dockerfile.builder" for architectures that are not (yet) supported by stable releases (notably, riscv64). # This is used to modify "Dockerfile.builder" for architectures that are not (yet) supported by stable releases (notably, riscv64).
sed -ri \ sed -ri \
-e 's/^(FROM debian:)[^ -]+/\1unstable/g' \ -e 's/^(FROM debian:)[^ -]+/\1unstable/g' \
-e 's/^(FROM alpine:)[^ -]+/\1edge/g' \
"${@/%//Dockerfile.builder}" "${@/%//Dockerfile.builder}"

5
latest-1/musl/Dockerfile.builder generated
View File

@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY. # PLEASE DO NOT EDIT IT DIRECTLY.
# #
FROM alpine:3.19 FROM alpine:3.20
RUN set -eux; \ RUN set -eux; \
apk add --no-cache \ apk add --no-cache \
@ -22,9 +22,6 @@ RUN set -eux; \
tar \ tar \
; ;
# https://github.com/alpinelinux/docker-alpine/issues/383
RUN set -eux; if grep -qF '/edge/' '/etc/apk/repositories'; then apk upgrade --no-cache libssl3 libcrypto3; curl --version; dirmngr --version; fi
# pub 1024D/ACC9965B 2006-12-12 # pub 1024D/ACC9965B 2006-12-12
# Key fingerprint = C9E9 416F 76E6 10DB D09D 040F 47B7 0C55 ACC9 965B # Key fingerprint = C9E9 416F 76E6 10DB D09D 040F 47B7 0C55 ACC9 965B
# uid Denis Vlasenko <vda.linux@googlemail.com> # uid Denis Vlasenko <vda.linux@googlemail.com>

0
latest-1/musl/amd64/blobs/sha256/f36b741eb9675622ca20443a43b42d5dae106e346115faf4b4604a51e63bd421 → latest-1/musl/amd64/blobs/sha256/4be3e63228b904f37e4e761ca32b93247afb159b5e09613a8aafb4c2e71243bf
View File

0
latest-1/musl/amd64/blobs/sha256/ab169714e570fc081439d21c6fefccdc40841c722a5ced84af57da7ccacce8e3 → latest-1/musl/amd64/blobs/sha256/bd060a885638c42149802c64c92784987012c6a44d6ddc18e7f7a4951d559c7e
View File

0
latest-1/musl/amd64/blobs/sha256/7e3712170429f1cb4fc838e6ec80548d6af2778301f3c88a57e4178d7aa16818 → latest-1/musl/amd64/blobs/sha256/d4939ac1b9d185464548f0b439a045c00650eb998c51a88ed637b9b4bc569f89
View File

4
latest-1/musl/amd64/image-config.json
View File

@ -8,13 +8,13 @@
"history": [ "history": [
{ {
"created": "2021-12-26T16:56:57Z", "created": "2021-12-26T16:56:57Z",
"created_by": "BusyBox 1.35.0 (musl), Alpine 3.19.1" "created_by": "BusyBox 1.35.0 (musl), Alpine 3.20.0"
} }
], ],
"rootfs": { "rootfs": {
"type": "layers", "type": "layers",
"diff_ids": [ "diff_ids": [
"sha256:e81af897a6ed42bf107335af397aee8b165cb545b01ebdda4cbd9fff72c51fdb" "sha256:94e0f174de0cfbe45e6120a840948123116ed3abb55cb023c10de16b808b935b"
] ]
}, },
"architecture": "amd64", "architecture": "amd64",

6
latest-1/musl/amd64/image-manifest.json
View File

@ -3,14 +3,14 @@
"mediaType": "application/vnd.oci.image.manifest.v1+json", "mediaType": "application/vnd.oci.image.manifest.v1+json",
"config": { "config": {
"mediaType": "application/vnd.oci.image.config.v1+json", "mediaType": "application/vnd.oci.image.config.v1+json",
"digest": "sha256:f36b741eb9675622ca20443a43b42d5dae106e346115faf4b4604a51e63bd421", "digest": "sha256:4be3e63228b904f37e4e761ca32b93247afb159b5e09613a8aafb4c2e71243bf",
"size": 375 "size": 375
}, },
"layers": [ "layers": [
{ {
"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip", "mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
"digest": "sha256:7e3712170429f1cb4fc838e6ec80548d6af2778301f3c88a57e4178d7aa16818", "digest": "sha256:d4939ac1b9d185464548f0b439a045c00650eb998c51a88ed637b9b4bc569f89",
"size": 849546 "size": 849283
} }
], ],
"annotations": { "annotations": {

2
latest-1/musl/amd64/index.json
View File

@ -4,7 +4,7 @@
"manifests": [ "manifests": [
{ {
"mediaType": "application/vnd.oci.image.manifest.v1+json", "mediaType": "application/vnd.oci.image.manifest.v1+json",
"digest": "sha256:ab169714e570fc081439d21c6fefccdc40841c722a5ced84af57da7ccacce8e3", "digest": "sha256:bd060a885638c42149802c64c92784987012c6a44d6ddc18e7f7a4951d559c7e",
"size": 608, "size": 608,
"platform": { "platform": {
"architecture": "amd64", "architecture": "amd64",

5
latest/musl/Dockerfile.builder generated
View File

@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY. # PLEASE DO NOT EDIT IT DIRECTLY.
# #
FROM alpine:3.19 FROM alpine:3.20
RUN set -eux; \ RUN set -eux; \
apk add --no-cache \ apk add --no-cache \
@ -22,9 +22,6 @@ RUN set -eux; \
tar \ tar \
; ;
# https://github.com/alpinelinux/docker-alpine/issues/383
RUN set -eux; if grep -qF '/edge/' '/etc/apk/repositories'; then apk upgrade --no-cache libssl3 libcrypto3; curl --version; dirmngr --version; fi
# pub 1024D/ACC9965B 2006-12-12 # pub 1024D/ACC9965B 2006-12-12
# Key fingerprint = C9E9 416F 76E6 10DB D09D 040F 47B7 0C55 ACC9 965B # Key fingerprint = C9E9 416F 76E6 10DB D09D 040F 47B7 0C55 ACC9 965B
# uid Denis Vlasenko <vda.linux@googlemail.com> # uid Denis Vlasenko <vda.linux@googlemail.com>

0
latest/musl/amd64/blobs/sha256/6e5e0f90c009d12db9478afe5656920e7bdd548e9fd8f50eab2be694102ae318 → latest/musl/amd64/blobs/sha256/615b080b9dbe1288d4b5a69a8344905e8a3181a02f251216b104b4daea5c3984
View File

0
latest/musl/amd64/blobs/sha256/b9d056b83bb6446fee29e89a7fcf10203c562c1f59586a6e2f39c903597bda34 → latest/musl/amd64/blobs/sha256/6d9a2e77c3b19944a28c3922f5715ede91c1ae869d91edf5f6adf88ed54e97cf
View File

0
latest/musl/amd64/blobs/sha256/d6e6e2f0bb218b28aaad3f646fd30a36549d61bfbbdd7ad5d1d75b9d9e671297 → latest/musl/amd64/blobs/sha256/da76cf628912174a928f788a59ff847a686ce63d9a86ca3ece325fbfc8443b99
View File

4
latest/musl/amd64/image-config.json
View File

@ -8,13 +8,13 @@
"history": [ "history": [
{ {
"created": "2023-05-18T22:34:17Z", "created": "2023-05-18T22:34:17Z",
"created_by": "BusyBox 1.36.1 (musl), Alpine 3.19.1" "created_by": "BusyBox 1.36.1 (musl), Alpine 3.20.0"
} }
], ],
"rootfs": { "rootfs": {
"type": "layers", "type": "layers",
"diff_ids": [ "diff_ids": [
"sha256:994bf8f4adc78c5c1e4a6b5e3b59ad57902b301e0e79255a3e95ea4b213a76bd" "sha256:c3136a3b698a9f25d09d8169258a08c3d3965f065186fe2a91549859fa45d1cc"
] ]
}, },
"architecture": "amd64", "architecture": "amd64",

6
latest/musl/amd64/image-manifest.json
View File

@ -3,14 +3,14 @@
"mediaType": "application/vnd.oci.image.manifest.v1+json", "mediaType": "application/vnd.oci.image.manifest.v1+json",
"config": { "config": {
"mediaType": "application/vnd.oci.image.config.v1+json", "mediaType": "application/vnd.oci.image.config.v1+json",
"digest": "sha256:6e5e0f90c009d12db9478afe5656920e7bdd548e9fd8f50eab2be694102ae318", "digest": "sha256:615b080b9dbe1288d4b5a69a8344905e8a3181a02f251216b104b4daea5c3984",
"size": 375 "size": 375
}, },
"layers": [ "layers": [
{ {
"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip", "mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
"digest": "sha256:d6e6e2f0bb218b28aaad3f646fd30a36549d61bfbbdd7ad5d1d75b9d9e671297", "digest": "sha256:da76cf628912174a928f788a59ff847a686ce63d9a86ca3ece325fbfc8443b99",
"size": 852587 "size": 852608
} }
], ],
"annotations": { "annotations": {

2
latest/musl/amd64/index.json
View File

@ -4,7 +4,7 @@
"manifests": [ "manifests": [
{ {
"mediaType": "application/vnd.oci.image.manifest.v1+json", "mediaType": "application/vnd.oci.image.manifest.v1+json",
"digest": "sha256:b9d056b83bb6446fee29e89a7fcf10203c562c1f59586a6e2f39c903597bda34", "digest": "sha256:6d9a2e77c3b19944a28c3922f5715ede91c1ae869d91edf5f6adf88ed54e97cf",
"size": 608, "size": 608,
"platform": { "platform": {
"architecture": "amd64", "architecture": "amd64",