Update busybox #13787
Merged
Update busybox #13787
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@80d4736: Update generated README - docker-library/busybox@c14f260: Merge pull request docker-library/busybox#157 from infosiftr/usr-bin-env - docker-library/busybox@c6062f2: Ensure we have "/usr/bin/env"
Diff for 2802604:diff --git a/_bashbrew-cat b/_bashbrew-cat
index e825689..2b8a457 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: 722a28618574f1cb95c8913e9d603fb506e2a005
-amd64-GitCommit: 4bcc936d8c90dfcf40b4c2728bb8150c2ee5cb82
+GitCommit: 80d473651eff65cceda1cd7936951051985ce87d
+amd64-GitCommit: e76753e7fb5d6607922972040ec4ef9bdae3d98c
amd64-GitFetch: refs/heads/dist-amd64
-arm32v5-GitCommit: 44350d7e6cb14808b40ef84aac7c5bdb8f93462d
+arm32v5-GitCommit: 50a70f213e66d40bb18d6faed0bb124de16d4771
arm32v5-GitFetch: refs/heads/dist-arm32v5
-arm32v6-GitCommit: 497a3a967c09c327b84664445b43761384d55da0
+arm32v6-GitCommit: cbc269ae1afc99cd00282ddcc5e40b1f13eea84c
arm32v6-GitFetch: refs/heads/dist-arm32v6
-arm32v7-GitCommit: b5f1e9a8c6d4ff6fec6b6be528064c1d975c77cd
+arm32v7-GitCommit: 4cfa77f8672eb109e52ef264acd4d1b2abd6949e
arm32v7-GitFetch: refs/heads/dist-arm32v7
-arm64v8-GitCommit: 740de92d37b1589809bdf8c17d94ee7be7acf255
+arm64v8-GitCommit: 7e6db01b03cc023968b8fdb632f6e2b397b1d407
arm64v8-GitFetch: refs/heads/dist-arm64v8
-i386-GitCommit: 8ef0783a61092fc34718de7db1579cf2e694b432
+i386-GitCommit: 024cdae3bcfd28d444c3ebf85bdf30bcdb0bbd06
i386-GitFetch: refs/heads/dist-i386
-mips64le-GitCommit: a020aef7981547a9efbd46ed4fa543076db978ec
+mips64le-GitCommit: eb1493ff307a7e1bc2d360160e9e3f52f512f99e
mips64le-GitFetch: refs/heads/dist-mips64le
-ppc64le-GitCommit: 509581849a07a77f52a8356b181b9d242c87b945
+ppc64le-GitCommit: d4bad29e8d4ae75ace0d0a7101eadcfae187531f
ppc64le-GitFetch: refs/heads/dist-ppc64le
-riscv64-GitCommit: fce0e67b610ae4706e91f464210218194f1e6e8a
+riscv64-GitCommit: f1a1130634773d9ca9cdc111633a3eace30fd47e
riscv64-GitFetch: refs/heads/dist-riscv64
-s390x-GitCommit: 45d0107c21b3d79824cbff6b442290da17e37ac1
+s390x-GitCommit: 27ed8fdef7075feeadfa5da8eba814b6e341a4c8
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 7aedf19..138bf37 100644
--- a/busybox_glibc/Dockerfile.builder
+++ b/busybox_glibc/Dockerfile.builder
@@ -170,7 +170,7 @@ RUN set -eux; \
} \
' ../buildroot/system/device_table.txt | sh -eux
-# create missing home directories
+# create missing home directories and ensure /usr/bin/env exists
RUN set -eux; \
cd rootfs; \
for userHome in $(awk -F ':' '{ print $3 ":" $4 "=" $6 }' etc/passwd); do \
@@ -182,10 +182,14 @@ RUN set -eux; \
chown "$user" "$home"; \
chmod 755 "$home"; \
fi; \
- done
+ done; \
+ if [ ! -s usr/bin/env ] && [ -s bin/env ]; then \
+ mkdir -p usr/bin; \
+ ln -s ../../bin/env usr/bin/; \
+ fi
# test and make sure it works
-RUN chroot rootfs /bin/sh -xec 'true'
+RUN chroot rootfs /usr/bin/env sh -xec 'true'
# ensure correct timezone (UTC)
RUN set -eux; \
diff --git a/busybox_glibc/busybox.tar.xz b/busybox_glibc/busybox.tar.xz
index 3daac87..2fff5c4 100644
Binary files a/busybox_glibc/busybox.tar.xz and b/busybox_glibc/busybox.tar.xz differ
diff --git a/busybox_glibc/busybox.tar.xz 'tar -t' b/busybox_glibc/busybox.tar.xz 'tar -t'
index f30633c..56bdd2e 100644
--- a/busybox_glibc/busybox.tar.xz 'tar -t'
+++ b/busybox_glibc/busybox.tar.xz 'tar -t'
@@ -429,6 +429,8 @@ lib64
root/
tmp/
usr/
+usr/bin/
+usr/bin/env
usr/sbin/
var/
var/spool/
diff --git a/busybox_latest/Dockerfile.builder b/busybox_latest/Dockerfile.builder
index 7aedf19..138bf37 100644
--- a/busybox_latest/Dockerfile.builder
+++ b/busybox_latest/Dockerfile.builder
@@ -170,7 +170,7 @@ RUN set -eux; \
} \
' ../buildroot/system/device_table.txt | sh -eux
-# create missing home directories
+# create missing home directories and ensure /usr/bin/env exists
RUN set -eux; \
cd rootfs; \
for userHome in $(awk -F ':' '{ print $3 ":" $4 "=" $6 }' etc/passwd); do \
@@ -182,10 +182,14 @@ RUN set -eux; \
chown "$user" "$home"; \
chmod 755 "$home"; \
fi; \
- done
+ done; \
+ if [ ! -s usr/bin/env ] && [ -s bin/env ]; then \
+ mkdir -p usr/bin; \
+ ln -s ../../bin/env usr/bin/; \
+ fi
# test and make sure it works
-RUN chroot rootfs /bin/sh -xec 'true'
+RUN chroot rootfs /usr/bin/env sh -xec 'true'
# ensure correct timezone (UTC)
RUN set -eux; \
diff --git a/busybox_latest/busybox.tar.xz b/busybox_latest/busybox.tar.xz
index 3daac87..2fff5c4 100644
Binary files a/busybox_latest/busybox.tar.xz and b/busybox_latest/busybox.tar.xz differ
diff --git a/busybox_latest/busybox.tar.xz 'tar -t' b/busybox_latest/busybox.tar.xz 'tar -t'
index f30633c..56bdd2e 100644
--- a/busybox_latest/busybox.tar.xz 'tar -t'
+++ b/busybox_latest/busybox.tar.xz 'tar -t'
@@ -429,6 +429,8 @@ lib64
root/
tmp/
usr/
+usr/bin/
+usr/bin/env
usr/sbin/
var/
var/spool/
diff --git a/busybox_musl/Dockerfile.builder b/busybox_musl/Dockerfile.builder
index 14c9c33..da07ee3 100644
--- a/busybox_musl/Dockerfile.builder
+++ b/busybox_musl/Dockerfile.builder
@@ -150,7 +150,7 @@ RUN set -eux; \
} \
' ../buildroot/system/device_table.txt | sh -eux
-# create missing home directories
+# create missing home directories and ensure /usr/bin/env exists
RUN set -eux; \
cd rootfs; \
for userHome in $(awk -F ':' '{ print $3 ":" $4 "=" $6 }' etc/passwd); do \
@@ -162,10 +162,14 @@ RUN set -eux; \
chown "$user" "$home"; \
chmod 755 "$home"; \
fi; \
- done
+ done; \
+ if [ ! -s usr/bin/env ] && [ -s bin/env ]; then \
+ mkdir -p usr/bin; \
+ ln -s ../../bin/env usr/bin/; \
+ fi
# test and make sure it works
-RUN chroot rootfs /bin/sh -xec 'true'
+RUN chroot rootfs /usr/bin/env sh -xec 'true'
# ensure correct timezone (UTC)
RUN set -eux; \
diff --git a/busybox_musl/busybox.tar.xz b/busybox_musl/busybox.tar.xz
index 3090b09..aaeda65 100644
Binary files a/busybox_musl/busybox.tar.xz and b/busybox_musl/busybox.tar.xz differ
diff --git a/busybox_musl/busybox.tar.xz 'tar -t' b/busybox_musl/busybox.tar.xz 'tar -t'
index 1b93f58..dde724e 100644
--- a/busybox_musl/busybox.tar.xz 'tar -t'
+++ b/busybox_musl/busybox.tar.xz 'tar -t'
@@ -411,6 +411,8 @@ home/
root/
tmp/
usr/
+usr/bin/
+usr/bin/env
usr/sbin/
var/
var/spool/
diff --git a/busybox_uclibc/Dockerfile.builder b/busybox_uclibc/Dockerfile.builder
index 4340487..96580d8 100644
--- a/busybox_uclibc/Dockerfile.builder
+++ b/busybox_uclibc/Dockerfile.builder
@@ -312,7 +312,7 @@ RUN set -eux; \
} \
' ../buildroot/system/device_table.txt | sh -eux
-# create missing home directories
+# create missing home directories and ensure /usr/bin/env exists
RUN set -eux; \
cd rootfs; \
for userHome in $(awk -F ':' '{ print $3 ":" $4 "=" $6 }' etc/passwd); do \
@@ -324,10 +324,14 @@ RUN set -eux; \
chown "$user" "$home"; \
chmod 755 "$home"; \
fi; \
- done
+ done; \
+ if [ ! -s usr/bin/env ] && [ -s bin/env ]; then \
+ mkdir -p usr/bin; \
+ ln -s ../../bin/env usr/bin/; \
+ fi
# test and make sure it works
-RUN chroot rootfs /bin/sh -xec 'true'
+RUN chroot rootfs /usr/bin/env sh -xec 'true'
# ensure correct timezone (UTC)
RUN set -eux; \
diff --git a/busybox_uclibc/busybox.tar.xz b/busybox_uclibc/busybox.tar.xz
index a5458a5..f81b564 100644
Binary files a/busybox_uclibc/busybox.tar.xz and b/busybox_uclibc/busybox.tar.xz differ
diff --git a/busybox_uclibc/busybox.tar.xz 'tar -t' b/busybox_uclibc/busybox.tar.xz 'tar -t'
index ab4bcc0..1951f0d 100644
--- a/busybox_uclibc/busybox.tar.xz 'tar -t'
+++ b/busybox_uclibc/busybox.tar.xz 'tar -t'
@@ -417,6 +417,8 @@ home/
root/
tmp/
usr/
+usr/bin/
+usr/bin/env
usr/sbin/
var/
var/spool/
diff --git a/busybox_unstable-glibc/Dockerfile.builder b/busybox_unstable-glibc/Dockerfile.builder
index 07c2b29..2dc356f 100644
--- a/busybox_unstable-glibc/Dockerfile.builder
+++ b/busybox_unstable-glibc/Dockerfile.builder
@@ -170,7 +170,7 @@ RUN set -eux; \
} \
' ../buildroot/system/device_table.txt | sh -eux
-# create missing home directories
+# create missing home directories and ensure /usr/bin/env exists
RUN set -eux; \
cd rootfs; \
for userHome in $(awk -F ':' '{ print $3 ":" $4 "=" $6 }' etc/passwd); do \
@@ -182,10 +182,14 @@ RUN set -eux; \
chown "$user" "$home"; \
chmod 755 "$home"; \
fi; \
- done
+ done; \
+ if [ ! -s usr/bin/env ] && [ -s bin/env ]; then \
+ mkdir -p usr/bin; \
+ ln -s ../../bin/env usr/bin/; \
+ fi
# test and make sure it works
-RUN chroot rootfs /bin/sh -xec 'true'
+RUN chroot rootfs /usr/bin/env sh -xec 'true'
# ensure correct timezone (UTC)
RUN set -eux; \
diff --git a/busybox_unstable-glibc/busybox.tar.xz b/busybox_unstable-glibc/busybox.tar.xz
index 8f364fb..4630e3a 100644
Binary files a/busybox_unstable-glibc/busybox.tar.xz and b/busybox_unstable-glibc/busybox.tar.xz differ
diff --git a/busybox_unstable-glibc/busybox.tar.xz 'tar -t' b/busybox_unstable-glibc/busybox.tar.xz 'tar -t'
index f30633c..56bdd2e 100644
--- a/busybox_unstable-glibc/busybox.tar.xz 'tar -t'
+++ b/busybox_unstable-glibc/busybox.tar.xz 'tar -t'
@@ -429,6 +429,8 @@ lib64
root/
tmp/
usr/
+usr/bin/
+usr/bin/env
usr/sbin/
var/
var/spool/
diff --git a/busybox_unstable-musl/Dockerfile.builder b/busybox_unstable-musl/Dockerfile.builder
index fad813b..0ddcc0d 100644
--- a/busybox_unstable-musl/Dockerfile.builder
+++ b/busybox_unstable-musl/Dockerfile.builder
@@ -150,7 +150,7 @@ RUN set -eux; \
} \
' ../buildroot/system/device_table.txt | sh -eux
-# create missing home directories
+# create missing home directories and ensure /usr/bin/env exists
RUN set -eux; \
cd rootfs; \
for userHome in $(awk -F ':' '{ print $3 ":" $4 "=" $6 }' etc/passwd); do \
@@ -162,10 +162,14 @@ RUN set -eux; \
chown "$user" "$home"; \
chmod 755 "$home"; \
fi; \
- done
+ done; \
+ if [ ! -s usr/bin/env ] && [ -s bin/env ]; then \
+ mkdir -p usr/bin; \
+ ln -s ../../bin/env usr/bin/; \
+ fi
# test and make sure it works
-RUN chroot rootfs /bin/sh -xec 'true'
+RUN chroot rootfs /usr/bin/env sh -xec 'true'
# ensure correct timezone (UTC)
RUN set -eux; \
diff --git a/busybox_unstable-musl/busybox.tar.xz b/busybox_unstable-musl/busybox.tar.xz
index 51bd108..2f02473 100644
Binary files a/busybox_unstable-musl/busybox.tar.xz and b/busybox_unstable-musl/busybox.tar.xz differ
diff --git a/busybox_unstable-musl/busybox.tar.xz 'tar -t' b/busybox_unstable-musl/busybox.tar.xz 'tar -t'
index 1b93f58..dde724e 100644
--- a/busybox_unstable-musl/busybox.tar.xz 'tar -t'
+++ b/busybox_unstable-musl/busybox.tar.xz 'tar -t'
@@ -411,6 +411,8 @@ home/
root/
tmp/
usr/
+usr/bin/
+usr/bin/env
usr/sbin/
var/
var/spool/
diff --git a/busybox_unstable-uclibc/Dockerfile.builder b/busybox_unstable-uclibc/Dockerfile.builder
index 9499015..30513f9 100644
--- a/busybox_unstable-uclibc/Dockerfile.builder
+++ b/busybox_unstable-uclibc/Dockerfile.builder
@@ -312,7 +312,7 @@ RUN set -eux; \
} \
' ../buildroot/system/device_table.txt | sh -eux
-# create missing home directories
+# create missing home directories and ensure /usr/bin/env exists
RUN set -eux; \
cd rootfs; \
for userHome in $(awk -F ':' '{ print $3 ":" $4 "=" $6 }' etc/passwd); do \
@@ -324,10 +324,14 @@ RUN set -eux; \
chown "$user" "$home"; \
chmod 755 "$home"; \
fi; \
- done
+ done; \
+ if [ ! -s usr/bin/env ] && [ -s bin/env ]; then \
+ mkdir -p usr/bin; \
+ ln -s ../../bin/env usr/bin/; \
+ fi
# test and make sure it works
-RUN chroot rootfs /bin/sh -xec 'true'
+RUN chroot rootfs /usr/bin/env sh -xec 'true'
# ensure correct timezone (UTC)
RUN set -eux; \
diff --git a/busybox_unstable-uclibc/busybox.tar.xz b/busybox_unstable-uclibc/busybox.tar.xz
index 1837d3d..f2c875e 100644
Binary files a/busybox_unstable-uclibc/busybox.tar.xz and b/busybox_unstable-uclibc/busybox.tar.xz differ
diff --git a/busybox_unstable-uclibc/busybox.tar.xz 'tar -t' b/busybox_unstable-uclibc/busybox.tar.xz 'tar -t'
index ab4bcc0..1951f0d 100644
--- a/busybox_unstable-uclibc/busybox.tar.xz 'tar -t'
+++ b/busybox_unstable-uclibc/busybox.tar.xz 'tar -t'
@@ -417,6 +417,8 @@ home/
root/
tmp/
usr/
+usr/bin/
+usr/bin/env
usr/sbin/
var/
var/spool/
diff --git a/busybox_unstable/Dockerfile.builder b/busybox_unstable/Dockerfile.builder
index 07c2b29..2dc356f 100644
--- a/busybox_unstable/Dockerfile.builder
+++ b/busybox_unstable/Dockerfile.builder
@@ -170,7 +170,7 @@ RUN set -eux; \
} \
' ../buildroot/system/device_table.txt | sh -eux
-# create missing home directories
+# create missing home directories and ensure /usr/bin/env exists
RUN set -eux; \
cd rootfs; \
for userHome in $(awk -F ':' '{ print $3 ":" $4 "=" $6 }' etc/passwd); do \
@@ -182,10 +182,14 @@ RUN set -eux; \
chown "$user" "$home"; \
chmod 755 "$home"; \
fi; \
- done
+ done; \
+ if [ ! -s usr/bin/env ] && [ -s bin/env ]; then \
+ mkdir -p usr/bin; \
+ ln -s ../../bin/env usr/bin/; \
+ fi
# test and make sure it works
-RUN chroot rootfs /bin/sh -xec 'true'
+RUN chroot rootfs /usr/bin/env sh -xec 'true'
# ensure correct timezone (UTC)
RUN set -eux; \
diff --git a/busybox_unstable/busybox.tar.xz b/busybox_unstable/busybox.tar.xz
index 8f364fb..4630e3a 100644
Binary files a/busybox_unstable/busybox.tar.xz and b/busybox_unstable/busybox.tar.xz differ
diff --git a/busybox_unstable/busybox.tar.xz 'tar -t' b/busybox_unstable/busybox.tar.xz 'tar -t'
index f30633c..56bdd2e 100644
--- a/busybox_unstable/busybox.tar.xz 'tar -t'
+++ b/busybox_unstable/busybox.tar.xz 'tar -t'
@@ -429,6 +429,8 @@ lib64
root/
tmp/
usr/
+usr/bin/
+usr/bin/env
usr/sbin/
var/
var/spool/Relevant Maintainers: |
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: