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 for oci-import changes #35

Merged
merged 1 commit into from
Mar 1, 2024
Merged

Update busybox for oci-import changes #35

merged 1 commit into from
Mar 1, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented Mar 1, 2024

See docker-library/busybox#188 (this is a companion to that)

I was planning to have this put the metadata commits directly on the master branch, but that's super racy, so I opted instead to create a separate meta-ARCH branch for each that we can instead cherry-pick from after we're certain we have all the builds and that they're all correct. 👀

I was planning to have this put the metadata commits directly on the master branch, but that's super racy, so I opted instead to create a separate meta-ARCH branch for each that we can instead cherry-pick from *after* we're certain we have all the builds and that they're all correct. 👀
@tianon tianon requested a review from yosifkit as a code owner March 1, 2024 23:23
@tianon
Copy link
Member Author

tianon commented Mar 1, 2024

Some example output for arm32v6 in that final "committing" stage:

+ date --date @1708637268 --rfc-email
+ GIT_AUTHOR_DATE=Thu, 22 Feb 2024 13:27:48 -0800
+ export GIT_AUTHOR_DATE GIT_COMMITTER_DATE=Thu, 22 Feb 2024 13:27:48 -0800
+ git branch -D meta-arm32v6
Deleted branch meta-arm32v6 (was e43e247).
+ git checkout -b meta-arm32v6
Switched to a new branch 'meta-arm32v6'
+ git rm --cached **/*.tar*
rm 'latest-1/musl/arm32v6/rootfs.tar.gz'
rm 'latest/musl/arm32v6/rootfs.tar.gz'
+ git diff --staged --name-only --exit-code
latest-1/musl/arm32v6/blobs/sha256/461d411de7876cfdf128f811777c85dd543305ccd7d56c8cfc3c1dfa5946a023
latest-1/musl/arm32v6/blobs/sha256/61f59067cdfe0c545fae7502917047079f6a876e78dcd0187c39928a1836a7d1
latest-1/musl/arm32v6/blobs/sha256/94f90368019e11514e9875c7b3593421417856e2b498d27aaa8d0b5b2f87b4ea
latest-1/musl/arm32v6/image-config.json
latest-1/musl/arm32v6/image-manifest.json
latest-1/musl/arm32v6/index.json
latest-1/musl/arm32v6/oci-layout
latest/musl/arm32v6/blobs/sha256/0bcc1b827b855c65eaf6e031e894e682b6170160b8a676e1df7527a19d51fb1a
latest/musl/arm32v6/blobs/sha256/7d205c11c6dd2dcafdc8f38f12db83ff61d6165cd69095f2918d31f1b587f8d5
latest/musl/arm32v6/blobs/sha256/d7e1102586fb0e4048aa13fa2b2dec0d046b4d252daf534b4465c028bec14698
latest/musl/arm32v6/image-config.json
latest/musl/arm32v6/image-manifest.json
latest/musl/arm32v6/index.json
latest/musl/arm32v6/oci-layout
+ git commit --message Update metadata for arm32v6
[meta-arm32v6 e43e247] Update metadata for arm32v6
 14 files changed, 134 insertions(+)
 create mode 120000 latest-1/musl/arm32v6/blobs/sha256/461d411de7876cfdf128f811777c85dd543305ccd7d56c8cfc3c1dfa5946a023
 create mode 120000 latest-1/musl/arm32v6/blobs/sha256/61f59067cdfe0c545fae7502917047079f6a876e78dcd0187c39928a1836a7d1
 create mode 120000 latest-1/musl/arm32v6/blobs/sha256/94f90368019e11514e9875c7b3593421417856e2b498d27aaa8d0b5b2f87b4ea
 create mode 100644 latest-1/musl/arm32v6/image-config.json
 create mode 100644 latest-1/musl/arm32v6/image-manifest.json
 create mode 100644 latest-1/musl/arm32v6/index.json
 create mode 100644 latest-1/musl/arm32v6/oci-layout
 create mode 120000 latest/musl/arm32v6/blobs/sha256/0bcc1b827b855c65eaf6e031e894e682b6170160b8a676e1df7527a19d51fb1a
 create mode 120000 latest/musl/arm32v6/blobs/sha256/7d205c11c6dd2dcafdc8f38f12db83ff61d6165cd69095f2918d31f1b587f8d5
 create mode 120000 latest/musl/arm32v6/blobs/sha256/d7e1102586fb0e4048aa13fa2b2dec0d046b4d252daf534b4465c028bec14698
 create mode 100644 latest/musl/arm32v6/image-config.json
 create mode 100644 latest/musl/arm32v6/image-manifest.json
 create mode 100644 latest/musl/arm32v6/index.json
 create mode 100644 latest/musl/arm32v6/oci-layout
+ git branch -D dist-arm32v6
Deleted branch dist-arm32v6 (was 6c1a204).
+ git checkout -b dist-arm32v6
Switched to a new branch 'dist-arm32v6'
+ git add -A .
+ git diff --staged --name-only --exit-code
latest-1/glibc/Dockerfile.builder
latest-1/musl/Dockerfile.builder
latest-1/musl/arm32v6/rootfs.tar.gz
latest-1/musl/busybox.tar.gz
latest-1/uclibc/Dockerfile.builder
latest/glibc/Dockerfile.builder
latest/musl/Dockerfile.builder
latest/musl/arm32v6/rootfs.tar.gz
latest/musl/busybox.tar.gz
latest/uclibc/Dockerfile.builder
+ git commit --message Builds for arm32v6
[dist-arm32v6 14f74ad] Builds for arm32v6
 10 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 latest-1/musl/arm32v6/rootfs.tar.gz
 create mode 120000 latest-1/musl/busybox.tar.gz
 create mode 100644 latest/musl/arm32v6/rootfs.tar.gz
 create mode 120000 latest/musl/busybox.tar.gz

@tianon tianon merged commit e711407 into master Mar 1, 2024
@tianon tianon deleted the busybox-oci branch March 1, 2024 23:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant