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 #16889

Merged
merged 1 commit into from
Jun 3, 2024
Merged

Update busybox #16889

merged 1 commit into from
Jun 3, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented May 31, 2024

Changes:

Changes:

- docker-library/busybox@a58bf7a: Update metadata for s390x
- docker-library/busybox@6f3c338: Update metadata for ppc64le
- docker-library/busybox@54e9044: Update metadata for mips64le
- docker-library/busybox@bd0f292: Update metadata for i386
- docker-library/busybox@c6a790d: Update metadata for arm64v8
- docker-library/busybox@bc8c404: Update metadata for arm32v7
- docker-library/busybox@5fb609b: Update metadata for arm32v6
- docker-library/busybox@50e03b3: Update metadata for arm32v5
- docker-library/busybox@a9f4f0d: Merge pull request docker-library/busybox#199 from infosiftr/remove-cbq
- docker-library/busybox@686bc28: Apply patch to remove CBQ functionality
- docker-library/busybox@d40b612: Merge pull request docker-library/busybox#197 from infosiftr/alpine3.20
- docker-library/busybox@d43ba9b: Update to Alpine 3.20
- docker-library/busybox@97f7e44: Update metadata for mips64le
- docker-library/busybox@702e53e: Update metadata for i386
- docker-library/busybox@3b0464c: Update metadata for arm64v8
- docker-library/busybox@95edf02: Update metadata for arm32v7
- docker-library/busybox@3c495cf: Update metadata for arm32v5
- docker-library/busybox@9a7aaf9: Merge pull request docker-library/busybox#195 from infosiftr/buildroot-2024.02.2
- docker-library/busybox@df272ca: Update amd64 metadata
@tianon tianon requested a review from a team as a code owner May 31, 2024 16:06
Copy link

Diff for 7565492:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 13bdf9e..c8129d7 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,27 +1,27 @@
 Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
 GitRepo: https://github.com/docker-library/busybox.git
-GitCommit: 97f7e4474e35d65268abe4a334d34eb9cb0b3608
+GitCommit: a58bf7afbc5d6430d5720626e3db59f987ebb0a2
 File: index.json
 Builder: oci-import
-amd64-GitCommit: 333060c8efc4ce573d8cf2a2b662d706d4b93f83
+amd64-GitCommit: 557fc6b60c652465f82bb915e7c55ab46984ceaf
 amd64-GitFetch: refs/heads/dist-amd64
-arm32v5-GitCommit: d40fbc880cf7abb46e0b9f141059e97a286ca26f
+arm32v5-GitCommit: 04c9c3d899194e73aded77726dcb5f6840b9295f
 arm32v5-GitFetch: refs/heads/dist-arm32v5
-arm32v6-GitCommit: 08320bc795bfbec362b41fc20b34857527d894e8
+arm32v6-GitCommit: 20fe3aba3b7a756b9f21cd1a8b1609bd9a5bcd63
 arm32v6-GitFetch: refs/heads/dist-arm32v6
-arm32v7-GitCommit: 6599aa8ff254dbc8f9af93d3fcb36f93e3ee25de
+arm32v7-GitCommit: 3964e0032165846da32b52031bab261044c3d920
 arm32v7-GitFetch: refs/heads/dist-arm32v7
-arm64v8-GitCommit: 9fac3af3a2904075993c11a1cc01c1f099c056b4
+arm64v8-GitCommit: 23b7350b8838ea73e848259895cfb5db626dab2e
 arm64v8-GitFetch: refs/heads/dist-arm64v8
-i386-GitCommit: 9bbbface6b42d2aded8c8bfd6fe564eaa37ff146
+i386-GitCommit: f436118f42c1fc1d2b53f376991b06ccaea5e50f
 i386-GitFetch: refs/heads/dist-i386
-mips64le-GitCommit: b04e5fa7760b8618c43dfb9f166a6d9f680cf922
+mips64le-GitCommit: 15672b834b27c60e549c5a2363ed31470b3d11dd
 mips64le-GitFetch: refs/heads/dist-mips64le
-ppc64le-GitCommit: f98c60b4114833d50df726b12bee69a3ef2abe07
+ppc64le-GitCommit: 2e75b39717f0cd2974f52db46179ea3d3fcc5ff8
 ppc64le-GitFetch: refs/heads/dist-ppc64le
-riscv64-GitCommit: 3d364d09d0650e28ddd49e20c5a64867f8660ffa
+riscv64-GitCommit: 9051ab627c7402a4e6b3e3a56209d9965b51f1d8
 riscv64-GitFetch: refs/heads/dist-riscv64
-s390x-GitCommit: 7b2d9614b454abc42305ae250c7325b5c9c914d7
+s390x-GitCommit: f7a8f851869fa700b14d329cd9bbc7cb4414c7bf
 s390x-GitFetch: refs/heads/dist-s390x
 
 Tags: 1.35.0, 1.35
diff --git a/busybox_1.35-musl/blobs/sha256/f36b741eb9675622ca20443a43b42d5dae106e346115faf4b4604a51e63bd421 b/busybox_1.35-musl/blobs/sha256/4be3e63228b904f37e4e761ca32b93247afb159b5e09613a8aafb4c2e71243bf
similarity index 64%
rename from busybox_1.35-musl/blobs/sha256/f36b741eb9675622ca20443a43b42d5dae106e346115faf4b4604a51e63bd421
rename to busybox_1.35-musl/blobs/sha256/4be3e63228b904f37e4e761ca32b93247afb159b5e09613a8aafb4c2e71243bf
index 7d5691e..b3a339f 100644
--- a/busybox_1.35-musl/blobs/sha256/f36b741eb9675622ca20443a43b42d5dae106e346115faf4b4604a51e63bd421
+++ b/busybox_1.35-musl/blobs/sha256/4be3e63228b904f37e4e761ca32b93247afb159b5e09613a8aafb4c2e71243bf
@@ -9,13 +9,13 @@
 	"history": [
 		{
 			"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"
 		}
 	],
 	"os": "linux",
 	"rootfs": {
 		"diff_ids": [
-			"sha256:e81af897a6ed42bf107335af397aee8b165cb545b01ebdda4cbd9fff72c51fdb"
+			"sha256:94e0f174de0cfbe45e6120a840948123116ed3abb55cb023c10de16b808b935b"
 		],
 		"type": "layers"
 	}
diff --git a/busybox_1.35-musl/blobs/sha256/ab169714e570fc081439d21c6fefccdc40841c722a5ced84af57da7ccacce8e3 b/busybox_1.35-musl/blobs/sha256/bd060a885638c42149802c64c92784987012c6a44d6ddc18e7f7a4951d559c7e
similarity index 68%
rename from busybox_1.35-musl/blobs/sha256/ab169714e570fc081439d21c6fefccdc40841c722a5ced84af57da7ccacce8e3
rename to busybox_1.35-musl/blobs/sha256/bd060a885638c42149802c64c92784987012c6a44d6ddc18e7f7a4951d559c7e
index c25d148..9780db6 100644
--- a/busybox_1.35-musl/blobs/sha256/ab169714e570fc081439d21c6fefccdc40841c722a5ced84af57da7ccacce8e3
+++ b/busybox_1.35-musl/blobs/sha256/bd060a885638c42149802c64c92784987012c6a44d6ddc18e7f7a4951d559c7e
@@ -4,15 +4,15 @@
 		"org.opencontainers.image.version": "1.35.0-musl"
 	},
 	"config": {
-		"digest": "sha256:f36b741eb9675622ca20443a43b42d5dae106e346115faf4b4604a51e63bd421",
+		"digest": "sha256:4be3e63228b904f37e4e761ca32b93247afb159b5e09613a8aafb4c2e71243bf",
 		"mediaType": "application/vnd.oci.image.config.v1+json",
 		"size": 375
 	},
 	"layers": [
 		{
-			"digest": "sha256:7e3712170429f1cb4fc838e6ec80548d6af2778301f3c88a57e4178d7aa16818",
+			"digest": "sha256:d4939ac1b9d185464548f0b439a045c00650eb998c51a88ed637b9b4bc569f89",
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
-			"size": 849546
+			"size": 849283
 		}
 	],
 	"mediaType": "application/vnd.oci.image.manifest.v1+json",
diff --git a/busybox_1.35-musl/blobs/sha256/7e3712170429f1cb4fc838e6ec80548d6af2778301f3c88a57e4178d7aa16818  'tar -t' b/busybox_1.35-musl/blobs/sha256/d4939ac1b9d185464548f0b439a045c00650eb998c51a88ed637b9b4bc569f89  'tar -t'
similarity index 100%
rename from busybox_1.35-musl/blobs/sha256/7e3712170429f1cb4fc838e6ec80548d6af2778301f3c88a57e4178d7aa16818  'tar -t'
rename to busybox_1.35-musl/blobs/sha256/d4939ac1b9d185464548f0b439a045c00650eb998c51a88ed637b9b4bc569f89  'tar -t'
diff --git a/busybox_1.35-musl/index.json b/busybox_1.35-musl/index.json
index 6bfec94..8d445ef 100644
--- a/busybox_1.35-musl/index.json
+++ b/busybox_1.35-musl/index.json
@@ -5,7 +5,7 @@
 				"io.containerd.image.name": "busybox:1.35.0-musl",
 				"org.opencontainers.image.ref.name": "busybox:1.35.0-musl"
 			},
-			"digest": "sha256:ab169714e570fc081439d21c6fefccdc40841c722a5ced84af57da7ccacce8e3",
+			"digest": "sha256:bd060a885638c42149802c64c92784987012c6a44d6ddc18e7f7a4951d559c7e",
 			"mediaType": "application/vnd.oci.image.manifest.v1+json",
 			"platform": {
 				"architecture": "amd64",
diff --git a/busybox_musl/blobs/sha256/6e5e0f90c009d12db9478afe5656920e7bdd548e9fd8f50eab2be694102ae318 b/busybox_musl/blobs/sha256/615b080b9dbe1288d4b5a69a8344905e8a3181a02f251216b104b4daea5c3984
similarity index 64%
rename from busybox_musl/blobs/sha256/6e5e0f90c009d12db9478afe5656920e7bdd548e9fd8f50eab2be694102ae318
rename to busybox_musl/blobs/sha256/615b080b9dbe1288d4b5a69a8344905e8a3181a02f251216b104b4daea5c3984
index 4fdf742..7bb2770 100644
--- a/busybox_musl/blobs/sha256/6e5e0f90c009d12db9478afe5656920e7bdd548e9fd8f50eab2be694102ae318
+++ b/busybox_musl/blobs/sha256/615b080b9dbe1288d4b5a69a8344905e8a3181a02f251216b104b4daea5c3984
@@ -9,13 +9,13 @@
 	"history": [
 		{
 			"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"
 		}
 	],
 	"os": "linux",
 	"rootfs": {
 		"diff_ids": [
-			"sha256:994bf8f4adc78c5c1e4a6b5e3b59ad57902b301e0e79255a3e95ea4b213a76bd"
+			"sha256:c3136a3b698a9f25d09d8169258a08c3d3965f065186fe2a91549859fa45d1cc"
 		],
 		"type": "layers"
 	}
diff --git a/busybox_musl/blobs/sha256/b9d056b83bb6446fee29e89a7fcf10203c562c1f59586a6e2f39c903597bda34 b/busybox_musl/blobs/sha256/6d9a2e77c3b19944a28c3922f5715ede91c1ae869d91edf5f6adf88ed54e97cf
similarity index 68%
rename from busybox_musl/blobs/sha256/b9d056b83bb6446fee29e89a7fcf10203c562c1f59586a6e2f39c903597bda34
rename to busybox_musl/blobs/sha256/6d9a2e77c3b19944a28c3922f5715ede91c1ae869d91edf5f6adf88ed54e97cf
index a9583ab..56657b2 100644
--- a/busybox_musl/blobs/sha256/b9d056b83bb6446fee29e89a7fcf10203c562c1f59586a6e2f39c903597bda34
+++ b/busybox_musl/blobs/sha256/6d9a2e77c3b19944a28c3922f5715ede91c1ae869d91edf5f6adf88ed54e97cf
@@ -4,15 +4,15 @@
 		"org.opencontainers.image.version": "1.36.1-musl"
 	},
 	"config": {
-		"digest": "sha256:6e5e0f90c009d12db9478afe5656920e7bdd548e9fd8f50eab2be694102ae318",
+		"digest": "sha256:615b080b9dbe1288d4b5a69a8344905e8a3181a02f251216b104b4daea5c3984",
 		"mediaType": "application/vnd.oci.image.config.v1+json",
 		"size": 375
 	},
 	"layers": [
 		{
-			"digest": "sha256:d6e6e2f0bb218b28aaad3f646fd30a36549d61bfbbdd7ad5d1d75b9d9e671297",
+			"digest": "sha256:da76cf628912174a928f788a59ff847a686ce63d9a86ca3ece325fbfc8443b99",
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
-			"size": 852587
+			"size": 852608
 		}
 	],
 	"mediaType": "application/vnd.oci.image.manifest.v1+json",
diff --git a/busybox_musl/blobs/sha256/d6e6e2f0bb218b28aaad3f646fd30a36549d61bfbbdd7ad5d1d75b9d9e671297  'tar -t' b/busybox_musl/blobs/sha256/da76cf628912174a928f788a59ff847a686ce63d9a86ca3ece325fbfc8443b99  'tar -t'
similarity index 100%
rename from busybox_musl/blobs/sha256/d6e6e2f0bb218b28aaad3f646fd30a36549d61bfbbdd7ad5d1d75b9d9e671297  'tar -t'
rename to busybox_musl/blobs/sha256/da76cf628912174a928f788a59ff847a686ce63d9a86ca3ece325fbfc8443b99  'tar -t'
diff --git a/busybox_musl/index.json b/busybox_musl/index.json
index daf5dd2..c0eab1f 100644
--- a/busybox_musl/index.json
+++ b/busybox_musl/index.json
@@ -5,7 +5,7 @@
 				"io.containerd.image.name": "busybox:1.36.1-musl",
 				"org.opencontainers.image.ref.name": "busybox:1.36.1-musl"
 			},
-			"digest": "sha256:b9d056b83bb6446fee29e89a7fcf10203c562c1f59586a6e2f39c903597bda34",
+			"digest": "sha256:6d9a2e77c3b19944a28c3922f5715ede91c1ae869d91edf5f6adf88ed54e97cf",
 			"mediaType": "application/vnd.oci.image.manifest.v1+json",
 			"platform": {
 				"architecture": "amd64",

Relevant Maintainers:

@yosifkit yosifkit merged commit 1a9c4d0 into docker-library:master Jun 3, 2024
13 checks passed
@yosifkit yosifkit deleted the busybox branch June 3, 2024 17:51
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.

4 participants