Update busybox #14642
Merged
Update busybox #14642
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
Changes: - docker-library/busybox@7a3eb46: Merge pull request docker-library/busybox#173 from J0WI/alpine-3.18 - docker-library/busybox@bb5b447: Add gnupg "keyboxd" workaround - docker-library/busybox@6d846b6: Alpine 3.18 - docker-library/busybox@50e34be: Merge pull request docker-library/busybox#171 from infosiftr/dirmngr - docker-library/busybox@4df1e6a: Remove explicit `dirmngr` reference
Diff for db41e35:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 62f68dd..62ed54e 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,25 +1,25 @@
Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
GitRepo: https://github.com/docker-library/busybox.git
-GitCommit: 38f129cf836c6f884ad61724a2bf9abe9a6d1278
-amd64-GitCommit: c4c1b1f404daebc67a32c5949d5d5b3af3b14302
+GitCommit: 7a3eb469d62296f2b1c56336d828593c2fefa228
+amd64-GitCommit: 66a290439cf51713829aa9e2ec76981ff047b1e2
amd64-GitFetch: refs/heads/dist-amd64
-arm32v5-GitCommit: af7a10e45060122362d8fbb355b83151f3d58add
+arm32v5-GitCommit: f128c22c601285facf0e792e94bd025e7de6c3e5
arm32v5-GitFetch: refs/heads/dist-arm32v5
-arm32v6-GitCommit: 3251c50e8a5a95b70ebd66b6c9445c337389d4c5
+arm32v6-GitCommit: d8c21dfbfc9fbf1362b7eb04a036290501557909
arm32v6-GitFetch: refs/heads/dist-arm32v6
-arm32v7-GitCommit: a34138b30517a30b79a2a2b623b8107eb2d3aa1d
+arm32v7-GitCommit: c4ff331c266ecc95b22bd2b6fb8ab5b5b07801c5
arm32v7-GitFetch: refs/heads/dist-arm32v7
-arm64v8-GitCommit: 905f4a7acda06df4b1d1884bd25f98f522f5afa8
+arm64v8-GitCommit: b50e2b5970e532251186dc294ffa3ee2f133b4b1
arm64v8-GitFetch: refs/heads/dist-arm64v8
-i386-GitCommit: 70d4dbc68ae635877da52318e5871014ae302e77
+i386-GitCommit: 68ca863fe49053e52fc119a4c8e819575f195ddc
i386-GitFetch: refs/heads/dist-i386
-mips64le-GitCommit: 2a60636094cbda7e071db5ba73871b777d31d0ba
+mips64le-GitCommit: cc2b7ca771871de62c8ff0f681729899620049fe
mips64le-GitFetch: refs/heads/dist-mips64le
-ppc64le-GitCommit: 1a8d828e317a782249cb83ca3bae442b48f5f41c
+ppc64le-GitCommit: 62046cedf65bc0ebdffae16965a1ded746f731fa
ppc64le-GitFetch: refs/heads/dist-ppc64le
-riscv64-GitCommit: c122eb4d92682b7ec9ddd44c215e728309a3e78e
+riscv64-GitCommit: 026022de16cd90089a9273e5767869ee4d3842fb
riscv64-GitFetch: refs/heads/dist-riscv64
-s390x-GitCommit: 19bd231d0c6e8d7156bbfd29d8bad0a7faa89503
+s390x-GitCommit: 208ada6a40cdd292959738235e805ce814bde85a
s390x-GitFetch: refs/heads/dist-s390x
Tags: 1.35.0, 1.35
diff --git a/busybox_1.35-glibc/Dockerfile.builder b/busybox_1.35-glibc/Dockerfile.builder
index 04f6079..e20d267 100644
--- a/busybox_1.35-glibc/Dockerfile.builder
+++ b/busybox_1.35-glibc/Dockerfile.builder
@@ -12,7 +12,7 @@ RUN set -eux; \
bzip2 \
curl \
gcc \
- gnupg dirmngr \
+ gnupg \
make \
patch \
; \
@@ -22,7 +22,7 @@ RUN set -eux; \
# Key fingerprint = C9E9 416F 76E6 10DB D09D 040F 47B7 0C55 ACC9 965B
# uid Denis Vlasenko <vda.linux@googlemail.com>
# sub 1024g/2C766641 2006-12-12
-RUN gpg --batch --keyserver keyserver.ubuntu.com --recv-keys C9E9416F76E610DBD09D040F47B70C55ACC9965B
+RUN mkdir -p ~/.gnupg && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys C9E9416F76E610DBD09D040F47B70C55ACC9965B
# https://busybox.net: 26 December 2021
ENV BUSYBOX_VERSION 1.35.0
diff --git a/busybox_1.35-glibc/busybox.tar.xz b/busybox_1.35-glibc/busybox.tar.xz
index 010b888..b6c2e08 100644
Binary files a/busybox_1.35-glibc/busybox.tar.xz and b/busybox_1.35-glibc/busybox.tar.xz differ
diff --git a/busybox_1.35-musl/Dockerfile.builder b/busybox_1.35-musl/Dockerfile.builder
index a74b651..4b75b4d 100644
--- a/busybox_1.35-musl/Dockerfile.builder
+++ b/busybox_1.35-musl/Dockerfile.builder
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM amd64/alpine:3.17
+FROM amd64/alpine:3.18
RUN set -eux; \
apk add --no-cache \
@@ -24,7 +24,7 @@ RUN set -eux; \
# Key fingerprint = C9E9 416F 76E6 10DB D09D 040F 47B7 0C55 ACC9 965B
# uid Denis Vlasenko <vda.linux@googlemail.com>
# sub 1024g/2C766641 2006-12-12
-RUN gpg --batch --keyserver keyserver.ubuntu.com --recv-keys C9E9416F76E610DBD09D040F47B70C55ACC9965B
+RUN mkdir -p ~/.gnupg && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys C9E9416F76E610DBD09D040F47B70C55ACC9965B
# https://busybox.net: 26 December 2021
ENV BUSYBOX_VERSION 1.35.0
diff --git a/busybox_1.35-musl/busybox.tar.xz b/busybox_1.35-musl/busybox.tar.xz
index c6f1db2..557665d 100644
Binary files a/busybox_1.35-musl/busybox.tar.xz and b/busybox_1.35-musl/busybox.tar.xz differ
diff --git a/busybox_1.35-uclibc/Dockerfile.builder b/busybox_1.35-uclibc/Dockerfile.builder
index d3c3c11..21098c6 100644
--- a/busybox_1.35-uclibc/Dockerfile.builder
+++ b/busybox_1.35-uclibc/Dockerfile.builder
@@ -12,7 +12,7 @@ RUN set -eux; \
bzip2 \
curl \
gcc \
- gnupg dirmngr \
+ gnupg \
make \
patch \
; \
@@ -40,7 +40,7 @@ RUN set -eux; \
# Key fingerprint = AB07 D806 D2CE 741F B886 EE50 B025 BA8B 59C3 6319
# uid Peter Korsgaard <jacmet@uclibc.org>
# sub 2048g/45428075 2009-01-15
-RUN gpg --batch --keyserver keyserver.ubuntu.com --recv-keys AB07D806D2CE741FB886EE50B025BA8B59C36319
+RUN mkdir -p ~/.gnupg && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys AB07D806D2CE741FB886EE50B025BA8B59C36319
# https://buildroot.org/download.html
# https://buildroot.org/downloads/?C=M;O=D
@@ -208,7 +208,7 @@ ENV PATH /usr/src/buildroot/output/host/usr/bin:$PATH
# Key fingerprint = C9E9 416F 76E6 10DB D09D 040F 47B7 0C55 ACC9 965B
# uid Denis Vlasenko <vda.linux@googlemail.com>
# sub 1024g/2C766641 2006-12-12
-RUN gpg --batch --keyserver keyserver.ubuntu.com --recv-keys C9E9416F76E610DBD09D040F47B70C55ACC9965B
+RUN mkdir -p ~/.gnupg && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys C9E9416F76E610DBD09D040F47B70C55ACC9965B
# https://busybox.net: 26 December 2021
ENV BUSYBOX_VERSION 1.35.0
diff --git a/busybox_1.35-uclibc/busybox.tar.xz b/busybox_1.35-uclibc/busybox.tar.xz
index ba40618..57d7edb 100644
Binary files a/busybox_1.35-uclibc/busybox.tar.xz and b/busybox_1.35-uclibc/busybox.tar.xz differ
diff --git a/busybox_1.35/Dockerfile.builder b/busybox_1.35/Dockerfile.builder
index 04f6079..e20d267 100644
--- a/busybox_1.35/Dockerfile.builder
+++ b/busybox_1.35/Dockerfile.builder
@@ -12,7 +12,7 @@ RUN set -eux; \
bzip2 \
curl \
gcc \
- gnupg dirmngr \
+ gnupg \
make \
patch \
; \
@@ -22,7 +22,7 @@ RUN set -eux; \
# Key fingerprint = C9E9 416F 76E6 10DB D09D 040F 47B7 0C55 ACC9 965B
# uid Denis Vlasenko <vda.linux@googlemail.com>
# sub 1024g/2C766641 2006-12-12
-RUN gpg --batch --keyserver keyserver.ubuntu.com --recv-keys C9E9416F76E610DBD09D040F47B70C55ACC9965B
+RUN mkdir -p ~/.gnupg && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys C9E9416F76E610DBD09D040F47B70C55ACC9965B
# https://busybox.net: 26 December 2021
ENV BUSYBOX_VERSION 1.35.0
diff --git a/busybox_1.35/busybox.tar.xz b/busybox_1.35/busybox.tar.xz
index 010b888..b6c2e08 100644
Binary files a/busybox_1.35/busybox.tar.xz and b/busybox_1.35/busybox.tar.xz differ
diff --git a/busybox_glibc/Dockerfile.builder b/busybox_glibc/Dockerfile.builder
index fc1ad47..ec21c50 100644
--- a/busybox_glibc/Dockerfile.builder
+++ b/busybox_glibc/Dockerfile.builder
@@ -12,7 +12,7 @@ RUN set -eux; \
bzip2 \
curl \
gcc \
- gnupg dirmngr \
+ gnupg \
make \
patch \
; \
@@ -22,7 +22,7 @@ RUN set -eux; \
# Key fingerprint = C9E9 416F 76E6 10DB D09D 040F 47B7 0C55 ACC9 965B
# uid Denis Vlasenko <vda.linux@googlemail.com>
# sub 1024g/2C766641 2006-12-12
-RUN gpg --batch --keyserver keyserver.ubuntu.com --recv-keys C9E9416F76E610DBD09D040F47B70C55ACC9965B
+RUN mkdir -p ~/.gnupg && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys C9E9416F76E610DBD09D040F47B70C55ACC9965B
# https://busybox.net: 3 January 2023
ENV BUSYBOX_VERSION 1.36.0
diff --git a/busybox_glibc/busybox.tar.xz b/busybox_glibc/busybox.tar.xz
index 2e67a57..bcc7086 100644
Binary files a/busybox_glibc/busybox.tar.xz and b/busybox_glibc/busybox.tar.xz differ
diff --git a/busybox_latest/Dockerfile.builder b/busybox_latest/Dockerfile.builder
index fc1ad47..ec21c50 100644
--- a/busybox_latest/Dockerfile.builder
+++ b/busybox_latest/Dockerfile.builder
@@ -12,7 +12,7 @@ RUN set -eux; \
bzip2 \
curl \
gcc \
- gnupg dirmngr \
+ gnupg \
make \
patch \
; \
@@ -22,7 +22,7 @@ RUN set -eux; \
# Key fingerprint = C9E9 416F 76E6 10DB D09D 040F 47B7 0C55 ACC9 965B
# uid Denis Vlasenko <vda.linux@googlemail.com>
# sub 1024g/2C766641 2006-12-12
-RUN gpg --batch --keyserver keyserver.ubuntu.com --recv-keys C9E9416F76E610DBD09D040F47B70C55ACC9965B
+RUN mkdir -p ~/.gnupg && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys C9E9416F76E610DBD09D040F47B70C55ACC9965B
# https://busybox.net: 3 January 2023
ENV BUSYBOX_VERSION 1.36.0
diff --git a/busybox_latest/busybox.tar.xz b/busybox_latest/busybox.tar.xz
index 2e67a57..bcc7086 100644
Binary files a/busybox_latest/busybox.tar.xz and b/busybox_latest/busybox.tar.xz differ
diff --git a/busybox_musl/Dockerfile.builder b/busybox_musl/Dockerfile.builder
index b947874..06bcc45 100644
--- a/busybox_musl/Dockerfile.builder
+++ b/busybox_musl/Dockerfile.builder
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM amd64/alpine:3.17
+FROM amd64/alpine:3.18
RUN set -eux; \
apk add --no-cache \
@@ -24,7 +24,7 @@ RUN set -eux; \
# Key fingerprint = C9E9 416F 76E6 10DB D09D 040F 47B7 0C55 ACC9 965B
# uid Denis Vlasenko <vda.linux@googlemail.com>
# sub 1024g/2C766641 2006-12-12
-RUN gpg --batch --keyserver keyserver.ubuntu.com --recv-keys C9E9416F76E610DBD09D040F47B70C55ACC9965B
+RUN mkdir -p ~/.gnupg && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys C9E9416F76E610DBD09D040F47B70C55ACC9965B
# https://busybox.net: 3 January 2023
ENV BUSYBOX_VERSION 1.36.0
diff --git a/busybox_musl/busybox.tar.xz b/busybox_musl/busybox.tar.xz
index 4531e37..4c9968a 100644
Binary files a/busybox_musl/busybox.tar.xz and b/busybox_musl/busybox.tar.xz differ
diff --git a/busybox_uclibc/Dockerfile.builder b/busybox_uclibc/Dockerfile.builder
index f0d39f7..7f2f26b 100644
--- a/busybox_uclibc/Dockerfile.builder
+++ b/busybox_uclibc/Dockerfile.builder
@@ -12,7 +12,7 @@ RUN set -eux; \
bzip2 \
curl \
gcc \
- gnupg dirmngr \
+ gnupg \
make \
patch \
; \
@@ -40,7 +40,7 @@ RUN set -eux; \
# Key fingerprint = AB07 D806 D2CE 741F B886 EE50 B025 BA8B 59C3 6319
# uid Peter Korsgaard <jacmet@uclibc.org>
# sub 2048g/45428075 2009-01-15
-RUN gpg --batch --keyserver keyserver.ubuntu.com --recv-keys AB07D806D2CE741FB886EE50B025BA8B59C36319
+RUN mkdir -p ~/.gnupg && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys AB07D806D2CE741FB886EE50B025BA8B59C36319
# https://buildroot.org/download.html
# https://buildroot.org/downloads/?C=M;O=D
@@ -208,7 +208,7 @@ ENV PATH /usr/src/buildroot/output/host/usr/bin:$PATH
# Key fingerprint = C9E9 416F 76E6 10DB D09D 040F 47B7 0C55 ACC9 965B
# uid Denis Vlasenko <vda.linux@googlemail.com>
# sub 1024g/2C766641 2006-12-12
-RUN gpg --batch --keyserver keyserver.ubuntu.com --recv-keys C9E9416F76E610DBD09D040F47B70C55ACC9965B
+RUN mkdir -p ~/.gnupg && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys C9E9416F76E610DBD09D040F47B70C55ACC9965B
# https://busybox.net: 3 January 2023
ENV BUSYBOX_VERSION 1.36.0
diff --git a/busybox_uclibc/busybox.tar.xz b/busybox_uclibc/busybox.tar.xz
index 5d18b05..7701e1f 100644
Binary files a/busybox_uclibc/busybox.tar.xz and b/busybox_uclibc/busybox.tar.xz differRelevant Maintainers: |
|
(moving to draft for docker-library/busybox#174) |
|
JK, that one is going to need more attention, this is good to go |
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.
Changes:
dirmngrreference busybox#171 from infosiftr/dirmngrdirmngrreference