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

Update busybox #13087

Merged
merged 1 commit into from
Sep 1, 2022
Merged

Update busybox #13087

merged 1 commit into from
Sep 1, 2022

Conversation

tianon
Copy link
Member

@tianon tianon commented Sep 1, 2022

Changes:

Changes:

- docker-library/busybox@84e9f7f: Merge pull request docker-library/busybox#144 from infosiftr/buildroot-2022.05.2
- docker-library/busybox@bc8031b: Update buildroot to 2022.05.2
@github-actions
Copy link

github-actions bot commented Sep 1, 2022

Diff for 867b435:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 3fbf85d..497ffaa 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: 51b5ed5f2cb833a8d4a3e346215701b872eaab5b
-amd64-GitCommit: c2e72d6cf3cc382f25d7d71ae70bb2013a517f1f
+GitCommit: 84e9f7fd2111828a1ae86979e84dab1103a55610
+amd64-GitCommit: e0c096ead17f3740c2e7e16c67ddba966f88d097
 amd64-GitFetch: refs/heads/dist-amd64
-arm32v5-GitCommit: 5ac8fe484f6f9285d9e7062fff7312557fa59f18
+arm32v5-GitCommit: e1f89e1d853214d9932d0d034ebe1b42a16b8bac
 arm32v5-GitFetch: refs/heads/dist-arm32v5
-arm32v6-GitCommit: 95d5be717f856e57055b43d4eb3bae29dd72727d
+arm32v6-GitCommit: 08c059b2f658b52a2299ca8e7faf390a721183a9
 arm32v6-GitFetch: refs/heads/dist-arm32v6
-arm32v7-GitCommit: 532fe38e7e3c370879ef703db639115fabc41dd1
+arm32v7-GitCommit: f746bbc5539c9da8f9ab438842eb91ee6fa581ea
 arm32v7-GitFetch: refs/heads/dist-arm32v7
-arm64v8-GitCommit: 0771fd6785ba397564a1c418ad1e3def3c9fa21c
+arm64v8-GitCommit: 48fcaa1068ae896c8ef37b4d23a9417de6ea600b
 arm64v8-GitFetch: refs/heads/dist-arm64v8
-i386-GitCommit: 03373386eaaa8a18b673c0fef25d146ea077269f
+i386-GitCommit: 0ca4168675b32353e237c8d6f32c256ab46169a2
 i386-GitFetch: refs/heads/dist-i386
-mips64le-GitCommit: f6ac2fba064b0ba2d42ea782e7c309db65a804d6
+mips64le-GitCommit: ff7e13c41eacdc68dfb0aaf0ea8f6b92e15b6386
 mips64le-GitFetch: refs/heads/dist-mips64le
-ppc64le-GitCommit: 6536c13bbd6bd056706da4c2cd93025907de759b
+ppc64le-GitCommit: 85026fb9e33f59f7c3eb13922c34f97de99eff00
 ppc64le-GitFetch: refs/heads/dist-ppc64le
-riscv64-GitCommit: 1a751ad1d0640c239f85747f3ba11743f27651fc
+riscv64-GitCommit: c5505e2c28fc5765c1e9e73327722609c483dbbd
 riscv64-GitFetch: refs/heads/dist-riscv64
-s390x-GitCommit: f4af3d4c831313e9ad64c65bb996cce569b44a0c
+s390x-GitCommit: e22d3801939fe59f2be26e37de09b2d5d5c69e08
 s390x-GitFetch: refs/heads/dist-s390x
 
 Tags: 1.34.1, 1.34, 1, stable, latest
diff --git a/busybox_glibc/Dockerfile.builder b/busybox_glibc/Dockerfile.builder
index 818f8ec..be04a60 100644
--- a/busybox_glibc/Dockerfile.builder
+++ b/busybox_glibc/Dockerfile.builder
@@ -131,7 +131,7 @@ RUN set -eux; \
 
 # install a few extra files from buildroot (/etc/passwd, etc)
 RUN set -eux; \
-	buildrootVersion='2022.05.1'; \
+	buildrootVersion='2022.05.2'; \
 	for file in \
 		system/device_table.txt \
 		system/skeleton/etc/group \
diff --git a/busybox_glibc/busybox.tar.xz b/busybox_glibc/busybox.tar.xz
index c5e9fc3..f42ff02 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 452a96d..5ce69d8 100644
--- a/busybox_latest/Dockerfile.builder
+++ b/busybox_latest/Dockerfile.builder
@@ -44,7 +44,7 @@ RUN gpg --batch --keyserver keyserver.ubuntu.com --recv-keys AB07D806D2CE741FB88
 
 # https://buildroot.org/download.html
 # https://buildroot.org/downloads/?C=M;O=D
-ENV BUILDROOT_VERSION 2022.05.1
+ENV BUILDROOT_VERSION 2022.05.2
 
 RUN set -eux; \
 	tarball="buildroot-${BUILDROOT_VERSION}.tar.xz"; \
diff --git a/busybox_latest/busybox.tar.xz b/busybox_latest/busybox.tar.xz
index d5490de..4725513 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 16f1b8e..0429954 100644
--- a/busybox_musl/Dockerfile.builder
+++ b/busybox_musl/Dockerfile.builder
@@ -111,7 +111,7 @@ RUN set -eux; \
 
 # install a few extra files from buildroot (/etc/passwd, etc)
 RUN set -eux; \
-	buildrootVersion='2022.05.1'; \
+	buildrootVersion='2022.05.2'; \
 	for file in \
 		system/device_table.txt \
 		system/skeleton/etc/group \
diff --git a/busybox_musl/busybox.tar.xz b/busybox_musl/busybox.tar.xz
index c3ff4a4..ac661bd 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 452a96d..5ce69d8 100644
--- a/busybox_uclibc/Dockerfile.builder
+++ b/busybox_uclibc/Dockerfile.builder
@@ -44,7 +44,7 @@ RUN gpg --batch --keyserver keyserver.ubuntu.com --recv-keys AB07D806D2CE741FB88
 
 # https://buildroot.org/download.html
 # https://buildroot.org/downloads/?C=M;O=D
-ENV BUILDROOT_VERSION 2022.05.1
+ENV BUILDROOT_VERSION 2022.05.2
 
 RUN set -eux; \
 	tarball="buildroot-${BUILDROOT_VERSION}.tar.xz"; \
diff --git a/busybox_uclibc/busybox.tar.xz b/busybox_uclibc/busybox.tar.xz
index d5490de..4725513 100644
Binary files a/busybox_uclibc/busybox.tar.xz and b/busybox_uclibc/busybox.tar.xz differ
diff --git a/busybox_unstable-glibc/Dockerfile.builder b/busybox_unstable-glibc/Dockerfile.builder
index cd98b66..7ca1caf 100644
--- a/busybox_unstable-glibc/Dockerfile.builder
+++ b/busybox_unstable-glibc/Dockerfile.builder
@@ -131,7 +131,7 @@ RUN set -eux; \
 
 # install a few extra files from buildroot (/etc/passwd, etc)
 RUN set -eux; \
-	buildrootVersion='2022.05.1'; \
+	buildrootVersion='2022.05.2'; \
 	for file in \
 		system/device_table.txt \
 		system/skeleton/etc/group \
diff --git a/busybox_unstable-glibc/busybox.tar.xz b/busybox_unstable-glibc/busybox.tar.xz
index 1d6c3d9..a8f4555 100644
Binary files a/busybox_unstable-glibc/busybox.tar.xz and b/busybox_unstable-glibc/busybox.tar.xz differ
diff --git a/busybox_unstable-musl/Dockerfile.builder b/busybox_unstable-musl/Dockerfile.builder
index 4d1f258..21a28c6 100644
--- a/busybox_unstable-musl/Dockerfile.builder
+++ b/busybox_unstable-musl/Dockerfile.builder
@@ -111,7 +111,7 @@ RUN set -eux; \
 
 # install a few extra files from buildroot (/etc/passwd, etc)
 RUN set -eux; \
-	buildrootVersion='2022.05.1'; \
+	buildrootVersion='2022.05.2'; \
 	for file in \
 		system/device_table.txt \
 		system/skeleton/etc/group \
diff --git a/busybox_unstable-musl/busybox.tar.xz b/busybox_unstable-musl/busybox.tar.xz
index 48cc241..1b497c9 100644
Binary files a/busybox_unstable-musl/busybox.tar.xz and b/busybox_unstable-musl/busybox.tar.xz differ
diff --git a/busybox_unstable-uclibc/Dockerfile.builder b/busybox_unstable-uclibc/Dockerfile.builder
index b434e78..0814f06 100644
--- a/busybox_unstable-uclibc/Dockerfile.builder
+++ b/busybox_unstable-uclibc/Dockerfile.builder
@@ -44,7 +44,7 @@ RUN gpg --batch --keyserver keyserver.ubuntu.com --recv-keys AB07D806D2CE741FB88
 
 # https://buildroot.org/download.html
 # https://buildroot.org/downloads/?C=M;O=D
-ENV BUILDROOT_VERSION 2022.05.1
+ENV BUILDROOT_VERSION 2022.05.2
 
 RUN set -eux; \
 	tarball="buildroot-${BUILDROOT_VERSION}.tar.xz"; \
diff --git a/busybox_unstable-uclibc/busybox.tar.xz b/busybox_unstable-uclibc/busybox.tar.xz
index f77ed35..94c08b1 100644
Binary files a/busybox_unstable-uclibc/busybox.tar.xz and b/busybox_unstable-uclibc/busybox.tar.xz differ
diff --git a/busybox_unstable/Dockerfile.builder b/busybox_unstable/Dockerfile.builder
index b434e78..0814f06 100644
--- a/busybox_unstable/Dockerfile.builder
+++ b/busybox_unstable/Dockerfile.builder
@@ -44,7 +44,7 @@ RUN gpg --batch --keyserver keyserver.ubuntu.com --recv-keys AB07D806D2CE741FB88
 
 # https://buildroot.org/download.html
 # https://buildroot.org/downloads/?C=M;O=D
-ENV BUILDROOT_VERSION 2022.05.1
+ENV BUILDROOT_VERSION 2022.05.2
 
 RUN set -eux; \
 	tarball="buildroot-${BUILDROOT_VERSION}.tar.xz"; \
diff --git a/busybox_unstable/busybox.tar.xz b/busybox_unstable/busybox.tar.xz
index f77ed35..94c08b1 100644
Binary files a/busybox_unstable/busybox.tar.xz and b/busybox_unstable/busybox.tar.xz differ

Relevant Maintainers:

@yosifkit yosifkit merged commit bf4420e into docker-library:master Sep 1, 2022
@yosifkit yosifkit deleted the busybox branch September 1, 2022 21:56
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.

3 participants