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

Fedora Update 20240813 #17352

Merged
merged 1 commit into from
Aug 14, 2024

Conversation

cverna
Copy link
Contributor

@cverna cverna commented Aug 13, 2024

No description provided.

@cverna cverna requested a review from a team as a code owner August 13, 2024 07:15

This comment has been minimized.

Copy link
Member

@tianon tianon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please continue using the full 40-character commit hashes? 😇

library/fedora Outdated
@@ -4,7 +4,7 @@ GitRepo: https://github.com/fedora-cloud/docker-brew-fedora.git
Tags: 39
Architectures: amd64, arm64v8, ppc64le, s390x
GitFetch: refs/heads/39
GitCommit: 8e39969bbb6fb9482cede31c19e969c48252939b
GitCommit: e493147
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
GitCommit: e493147
GitCommit: e493147cb7383bda672f4295c09e435d83047efa

library/fedora Outdated
@@ -13,7 +13,7 @@ ppc64le-Directory: ppc64le/
Tags: 40, latest
Architectures: amd64, arm64v8, ppc64le, s390x
GitFetch: refs/heads/40
GitCommit: 7f9dbbf47c41b95d34c7722927bb93816956cfe1
GitCommit: 978adc7
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
GitCommit: 978adc7
GitCommit: 978adc7dc216f09fca95de7174734748710fe1df

library/fedora Outdated
@@ -22,7 +22,7 @@ ppc64le-Directory: ppc64le/
Tags: 41, rawhide
Architectures: amd64, arm64v8, ppc64le, s390x
GitFetch: refs/heads/41
GitCommit: 68b26415c2ff3605aed2f7c737b74048b23d7fdf
GitCommit: c527fe0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
GitCommit: c527fe0
GitCommit: c527fe0bcd2f1d8fbbbe61467ad50546567a655b

@cverna
Copy link
Contributor Author

cverna commented Aug 14, 2024

Can you please continue using the full 40-character commit hashes? 😇

Sure, just curious any special reason for it? It's faster for me to create the PR with the short commit hashes 😄

Signed-off-by: Clement Verna <[email protected]>
@cverna cverna force-pushed the fedora_update_20240813 branch from 06d8a0c to af81fa0 Compare August 14, 2024 06:03
Copy link

Diff for af81fa0:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index b59a95c..e02dc28 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -4,7 +4,7 @@ GitRepo: https://github.com/fedora-cloud/docker-brew-fedora.git
 Tags: 39
 Architectures: amd64, arm64v8, ppc64le, s390x
 GitFetch: refs/heads/39
-GitCommit: 8e39969bbb6fb9482cede31c19e969c48252939b
+GitCommit: e493147cb7383bda672f4295c09e435d83047efa
 amd64-Directory: x86_64
 arm64v8-Directory: aarch64
 ppc64le-Directory: ppc64le
@@ -13,7 +13,7 @@ s390x-Directory: s390x
 Tags: 40, latest
 Architectures: amd64, arm64v8, ppc64le, s390x
 GitFetch: refs/heads/40
-GitCommit: 7f9dbbf47c41b95d34c7722927bb93816956cfe1
+GitCommit: 978adc7dc216f09fca95de7174734748710fe1df
 amd64-Directory: x86_64
 arm64v8-Directory: aarch64
 ppc64le-Directory: ppc64le
@@ -22,7 +22,7 @@ s390x-Directory: s390x
 Tags: 41, rawhide
 Architectures: amd64, arm64v8, ppc64le, s390x
 GitFetch: refs/heads/41
-GitCommit: 68b26415c2ff3605aed2f7c737b74048b23d7fdf
+GitCommit: c527fe0bcd2f1d8fbbbe61467ad50546567a655b
 amd64-Directory: x86_64
 arm64v8-Directory: aarch64
 ppc64le-Directory: ppc64le
diff --git a/fedora_39/fedora-39-x86_64.tar.xz b/fedora_39/fedora-39-x86_64.tar.xz
index a3ffd42..04b98ce 100644
Binary files a/fedora_39/fedora-39-x86_64.tar.xz and b/fedora_39/fedora-39-x86_64.tar.xz differ
diff --git a/fedora_39/fedora-39-x86_64.tar.xz  'tar -t' b/fedora_39/fedora-39-x86_64.tar.xz  'tar -t'
index 45530e8..8e42789 100644
--- a/fedora_39/fedora-39-x86_64.tar.xz  'tar -t'	
+++ b/fedora_39/fedora-39-x86_64.tar.xz  'tar -t'	
@@ -2135,7 +2135,7 @@ usr/lib64/libyaml-0.so.2.0.9
 usr/lib64/libz.so.1
 usr/lib64/libz.so.1.2.13
 usr/lib64/libzck.so.1
-usr/lib64/libzck.so.1.4.0
+usr/lib64/libzck.so.1.5.1
 usr/lib64/libzstd.so.1
 usr/lib64/libzstd.so.1.5.6
 usr/lib64/lua/
diff --git a/fedora_rawhide/layer.tar b/fedora_rawhide/layer.tar
index 2a327a1..0bc6352 100644
Binary files a/fedora_rawhide/layer.tar and b/fedora_rawhide/layer.tar differ

Relevant Maintainers:

@tianon
Copy link
Member

tianon commented Aug 14, 2024

Sure, just curious any special reason for it? It's faster for me to create the PR with the short commit hashes 😄

Oh, yeah -- they're a checksum of the actual commit contents, so they're the way we can verify the contents we fetch. Generating a collision of a short commit ID is going to be pretty trivial (and won't be likely to be detected/blocked by GitHub) whereas collisions of the full SHA1 commit ID are going to be much more expensive to generate and will be detected/blocked by GitHub. 👀
(see also https://github.blog/news-insights/company-news/sha-1-collision-detection-on-github-com/)

If you're copying these from the command-line (or CI), you can use something like git rev-parse HEAD (or git log -1 --format=format:%H which is the one I usually end up reaching for because I forget about rev-parse 😂).

If you're copying them from the GitHub web UI, you can press y (the only keyboard shortcut on GitHub I actually use/like!) and it'll put you at a permalink that includes the full commit hash in the URL or you can go to the "commits" / "History" view and there's a direct copy button for the full hash. 👍

@tianon
Copy link
Member

tianon commented Aug 14, 2024

(I honestly thought our tooling was already validating that these were full commit hashes, but it turns out it wasn't due to some legacy concerns that no longer apply, so that's also been fixed in docker-library/bashbrew#105 👍)

@tianon tianon merged commit 2ac7068 into docker-library:master Aug 14, 2024
8 checks passed
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.

2 participants