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 metadata #191

Merged
merged 8 commits into from
Mar 5, 2024
Merged

Update metadata #191

merged 8 commits into from
Mar 5, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented Mar 5, 2024

This cherry-picks all the metadata commits from the (now successful) assorted meta-* branches (as discussed/planned over in #188).

The command I used to generate this branch:

git branch --list --remotes --format '..%(refname:short)' docker-library/meta-* | grep -v riscv64 | tac | xargs -rt git cherry-pick -x

Output then looks something like:

$ git branch --list --remotes --format '..%(refname:short)' docker-library/meta-* | grep -v riscv64 | tac | xargs -rt git cherry-pick -x
git cherry-pick -x ..docker-library/meta-s390x ..docker-library/meta-ppc64le ..docker-library/meta-mips64le ..docker-library/meta-i386 ..docker-library/meta-arm64v8 ..docker-library/meta-arm32v7 ..docker-library/meta-arm32v6 ..docker-library/meta-arm32v5 ..docker-library/meta-amd64
[cherry-meta 884455c] Update metadata for arm32v5
...

(Assumptions there being that my local "upstream"/"origin" remote is named docker-library and I have done a fresh git fetch -p docker-library and my local fetch config for the docker-library remote includes fetch = +refs/heads/meta-*:refs/remotes/docker-library/meta-*)

Notably, I have not included riscv64 here because I do not actually believe it will stay reproducible over time (due to being based on Debian Unstable + Alpine Edge and having to do hacks to even get it to build successfully right now; see 10a1d6f, especially latest/musl/Dockerfile.builder / docker-library/oi-janky-groovy@5143023).

(cherry picked from commit 96d6ecd)
(cherry picked from commit 60f0107)
(cherry picked from commit fbf52fa)
(cherry picked from commit 978b34d)
(cherry picked from commit a641654)
(cherry picked from commit 4afd920)
(cherry picked from commit c40c3bf)
(cherry picked from commit 5c3d91c)
@tianon tianon merged commit a20bcbd into docker-library:master Mar 5, 2024
14 checks passed
@tianon tianon deleted the cherry-meta branch March 5, 2024 19:36
docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request Mar 5, 2024
Changes:

- docker-library/busybox@a20bcbd: Merge pull request docker-library/busybox#191 from infosiftr/cherry-meta
- docker-library/busybox@0fd3015: Stop `latest` aliases on riscv64 from pointing to anything but uclibc (for now)
- docker-library/busybox@69f51a1: Update metadata for s390x
- docker-library/busybox@f29b4e0: Update metadata for ppc64le
- docker-library/busybox@8d72643: Update metadata for mips64le
- docker-library/busybox@51977e5: Update metadata for i386
- docker-library/busybox@b52155f: Update metadata for arm64v8
- docker-library/busybox@2568e26: Update metadata for arm32v7
- docker-library/busybox@a6e074f: Update metadata for arm32v6
- docker-library/busybox@884455c: Update metadata for arm32v5
- docker-library/busybox@6ded0a4: Merge pull request docker-library/busybox#188 from infosiftr/reproducible-rootfs
- docker-library/busybox@7e39d61: Initial `Builder: oci-import` support
- docker-library/busybox@644ee1a: Adjust tarball creation to be reproducible
martin-g pushed a commit to martin-g/docker-official-images that referenced this pull request Apr 3, 2024
Changes:

- docker-library/busybox@a20bcbd: Merge pull request docker-library/busybox#191 from infosiftr/cherry-meta
- docker-library/busybox@0fd3015: Stop `latest` aliases on riscv64 from pointing to anything but uclibc (for now)
- docker-library/busybox@69f51a1: Update metadata for s390x
- docker-library/busybox@f29b4e0: Update metadata for ppc64le
- docker-library/busybox@8d72643: Update metadata for mips64le
- docker-library/busybox@51977e5: Update metadata for i386
- docker-library/busybox@b52155f: Update metadata for arm64v8
- docker-library/busybox@2568e26: Update metadata for arm32v7
- docker-library/busybox@a6e074f: Update metadata for arm32v6
- docker-library/busybox@884455c: Update metadata for arm32v5
- docker-library/busybox@6ded0a4: Merge pull request docker-library/busybox#188 from infosiftr/reproducible-rootfs
- docker-library/busybox@7e39d61: Initial `Builder: oci-import` support
- docker-library/busybox@644ee1a: Adjust tarball creation to be reproducible
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.

2 participants