Bump busybox to 1.37.0 (#1895)

* Bump busybox to 1.37.0
* Update file name to be correct
* Use raw file, don't point to github link
* Move other two architectures to the same format

Author: paul1r

MODULE.bazel.lock

@@ -7,4 +7,4 @@ fileExistenceTests:
 commandTests:
   - name: busybox
     command: ["/busybox/busybox"]
-    expectedOutput: ['BusyBox v1\.36\.1']
+    expectedOutput: ['BusyBox v1\.37\.0']

base/testdata/debug.yaml

@@ -4,11 +4,13 @@ load(":commands.bzl", "busybox_layer")
 package(default_visibility = ["//base:__subpackages__"])
 
 # This works for all architectures because it is just files.
-# Ppc64le/Arm64/Amd64 needs special case as there is no direct working binary file available.
+# Ppc64le/Arm/Arm64/Amd64/s390x needs special case as there is no direct working binary file available.
 SPECIAL_CASE_ARCH = [
     "ppc64le",
+    "arm",
     "arm64",
     "amd64",
+    "s390x",
 ]
 
 [

experimental/busybox/BUILD

@@ -14,50 +14,60 @@ def _busybox_impl(module_ctx):
     # To update amd64 busybox binary (#1014)
     # Get the latest commit hash from dist-amd64 branch of docker-library repo. You can also view it
     # at https://github.com/docker-library/official-images/blob/master/library/busybox
-    # Substitute it in the link: https://github.com/docker-library/busybox/raw/<latest-commit-hash>/latest/musl/busybox.tar.xz
+    # Substitute it in the link: https://github.com/docker-library/busybox/raw/<latest-commit-hash>/latest/musl/busybox.tar.gz
     # Update the sha256 value. Since github api doesn't give sha256 value, it can be obtained using sha256sum command.
     http_archive(
         name = "busybox_amd64",
-        sha256 = "77b216d55c6895ddb04a90f3025b5ce2480140da779fe3dca91303b135a1fefe",
-        urls = ["https://github.com/docker-library/busybox/raw/09ee80aedec1d8c604f104e8bec41ed19274620a/latest/musl/busybox.tar.xz"],
+        sha256 = "8e7bef4a92afca21c56c9f85e4e63885b320f1da8f8f82a1cf87af359faf57d3",
+        urls = ["https://raw.githubusercontent.com/docker-library/busybox/e5b5178110ca0332364a77d5eb4fff87b0e2ba3f/latest/musl/amd64/rootfs.tar.gz"],
         build_file_content = BUSYBOX_ARCHIVE_BUILD,
     )
 
-    http_file(
+    # To update arm busybox binary
+    # Get the latest commit hash from dist-arm32v7 branch of docker-library repo. You can also view it
+    # at https://github.com/docker-library/official-images/blob/master/library/busybox
+    # Substitute it in the link: https://github.com/docker-library/busybox/raw/<latest-commit-hash>/latest/musl/arm32v7/rootfs.tar.gz
+    # Update the sha256 value. Since github api doesn't give sha256 value, it can be obtained using sha256sum command.
+    http_archive(
         name = "busybox_arm",
-        executable = True,
-        sha256 = "cd04052b8b6885f75f50b2a280bfcbf849d8710c8e61d369c533acf307eda064",
-        urls = ["https://busybox.net/downloads/binaries/1.31.0-defconfig-multiarch-musl/busybox-armv7l"],
+        sha256 = "3c873527f998bba56151b7c7d19c133390a44ef894242e7ad5536de1ac0c347e",
+        urls = ["https://raw.githubusercontent.com/docker-library/busybox/a4fac83861d137e9dcfce70b31d0b8fafea9346e/latest/musl/arm32v7/rootfs.tar.gz"],
+        build_file_content = BUSYBOX_ARCHIVE_BUILD,
     )
 
     # To update arm64 busybox binary (#657)
     # Get the latest commit hash from dist-arm64v8 branch of docker-library repo. You can also view it
     # at https://github.com/docker-library/official-images/blob/master/library/busybox
-    # Substitute it in the link: https://github.com/docker-library/busybox/raw/<latest-commit-hash>/latest/musl/busybox.tar.xz
+    # Substitute it in the link: https://github.com/docker-library/busybox/raw/<latest-commit-hash>/latest/musl/busybox.tar.gz
     # Update the sha256 value. Since github api doesn't give sha256 value, it can be obtained using sha256sum command.
     http_archive(
         name = "busybox_arm64",
-        sha256 = "1d0610f348ae3f95897a967fae429b0a0c712b252ca63e1547a89bf13a1a82c7",
-        urls = ["https://github.com/docker-library/busybox/raw/e5e22cb0710fe54da4beaa6a72c1bd56b8fc9c54/latest/musl/busybox.tar.xz"],
+        sha256 = "07b73337cea2a5d87c21278f251e1e742e253232ebd035d6a4a6d2cb4612e462",
+        urls = ["https://raw.githubusercontent.com/docker-library/busybox/f30de561de9bf38da10058620e9c4c383ec8a905/latest/musl/arm64v8/rootfs.tar.gz"],
         build_file_content = BUSYBOX_ARCHIVE_BUILD,
     )
 
-    http_file(
+    # To update s390x busybox binary
+    # Get the latest commit hash from dist-s390x branch of docker-library repo. You can also view it
+    # at https://github.com/docker-library/official-images/blob/master/library/busybox
+    # Substitute it in the link: https://github.com/docker-library/busybox/raw/<latest-commit-hash>/latest/musl/s390x/rootfs.tar.gz
+    # Update the sha256 value. Since github api doesn't give sha256 value, it can be obtained using sha256sum command.
+    http_archive(
         name = "busybox_s390x",
-        executable = True,
-        sha256 = "48d13ac057046b95ba58921958be639cc3a179ac888cdd65aacd7a69139aa857",
-        urls = ["https://busybox.net/downloads/binaries/1.31.0-defconfig-multiarch-musl/busybox-s390x"],
+        sha256 = "3bd977f75e22a5e164e2e6ac3556cee55053022e9ad8bba89614e7a8680791d1",
+        urls = ["https://raw.githubusercontent.com/docker-library/busybox/87c948a4fac6f84195e795486a8d650b0c9cc10d/latest/musl/s390x/rootfs.tar.gz"],
+        build_file_content = BUSYBOX_ARCHIVE_BUILD,
     )
 
     # To update ppc64le busybox binary (#723)
     # Get the latest commit hash from dist-ppc64le branch of docker-library repo. You can also view it
     # at https://github.com/docker-library/official-images/blob/master/library/busybox
-    # Substitute it in the link: https://github.com/docker-library/busybox/raw/<latest-commit-hash>/latest/musl/busybox.tar.xz
+    # Substitute it in the link: https://github.com/docker-library/busybox/raw/<latest-commit-hash>/latest/musl/busybox.tar.gz
     # Update the sha256 value. Since github api doesn't give sha256 value, it can be obtained using sha256sum command.
     http_archive(
         name = "busybox_ppc64le",
-        sha256 = "2d898cab234190697e5df74c537dd86955e9f61725d6c86d97b97c3d58aed9ca",
-        urls = ["https://github.com/docker-library/busybox/raw/aa059e43d48801abcb012dfa965a432fa12c385d/latest/musl/busybox.tar.xz"],
+        sha256 = "f3f5d636887b8d56aabe29047a58ef074511f5252c722b1e476b7f79fd35fb7f",
+        urls = ["https://raw.githubusercontent.com/docker-library/busybox/149c39d6036d77a55679c6b9e0c946ba2ad38555/latest/musl/ppc64le/rootfs.tar.gz"],
         build_file_content = BUSYBOX_ARCHIVE_BUILD,
     )