Skip to content

Comments

Add check to naughty-commits to ensure that referenced commit exists in the upstream#11071

Merged
tianon merged 1 commit intodocker-library:masterfrom
infosiftr:enforce-gitfetch
Oct 8, 2021
Merged

Add check to naughty-commits to ensure that referenced commit exists in the upstream#11071
tianon merged 1 commit intodocker-library:masterfrom
infosiftr:enforce-gitfetch

Conversation

@yosifkit
Copy link
Member

@yosifkit yosifkit commented Oct 8, 2021

This uses the GitFetch branch to ensure that the commit does not come from outside the upstream repo. This will cause a few images to need to set a default GitFetch since they use a branch other than master.

Also update the last single-line-format library files (sourcemage and thrift) to rfc2822 format to avoid refs/heads/*; should either of these just be emptied since they are deprecated? (docker-library/docs#1433 and docker-library/docs#1732)

current output:
$ ./naughty-commits.sh
 - arangodb:
   - commit cd9cff3458077a32daaf1d6d31899056c08a07c6:
     - is not in the specified ref GitFetch: refs/heads/master
   - commit 42fc6401e569423cab28e71b0085dc78300caa84:
     - is not in the specified ref GitFetch: refs/heads/master

 - bonita:
   - commit a1d9ee5e31d38958aa553cc7f9d465f1151d902f:
     - is not in the specified ref GitFetch: refs/heads/master

fatal: couldn't find remote ref refs/tags/clear-linux-35090
 - clearlinux:
   - commit 89ec5b23516ddc81799aeb66e989fd21bcd679b6:
     - unable to to fetch specified GitFetch: refs/tags/clear-linux-35090

 - couchdb:
   - commit ee358e62d72bdd72fd69d67ba7fbc80580502270:
     - is not in the specified ref GitFetch: refs/heads/master

 - crate:
   - commit 896c3f63e8e3d4746019e379a7aefb5225b050e3:
     - is not in the specified ref GitFetch: refs/heads/master

fatal: couldn't find remote ref refs/heads/master
fatal: couldn't find remote ref refs/heads/master
fatal: couldn't find remote ref refs/heads/master
fatal: couldn't find remote ref refs/heads/master
fatal: couldn't find remote ref refs/heads/master
fatal: couldn't find remote ref refs/heads/master
fatal: couldn't find remote ref refs/heads/master
fatal: couldn't find remote ref refs/heads/master
 - eclipse-temurin:
   - commit b60534569e25b3e721441185c1c36ebac17cf2ce:
     - unable to to fetch specified GitFetch: refs/heads/master
   - commit b54d893a02d99a837374d6ca2195ba26fd9154ce:
     - unable to to fetch specified GitFetch: refs/heads/master
   - commit 4b9b98b68117a9476073d2d8461369e3624fac09:
     - unable to to fetch specified GitFetch: refs/heads/master
   - commit 37f56aac1070ee4c160d442e00d81bbd4c86bb8a:
     - unable to to fetch specified GitFetch: refs/heads/master
   - commit d680bdcff4dc49f5efa11d45b900c94bc8bd5366:
     - unable to to fetch specified GitFetch: refs/heads/master
   - commit 82d5d32783ca6b516cf52f4c4743f46b197ad83b:
     - unable to to fetch specified GitFetch: refs/heads/master
   - commit 63defc24ed1b9051b48f6dfc747761a1b88a3b42:
     - unable to to fetch specified GitFetch: refs/heads/master
   - commit c611c0d0d5c9efd70a7569a33dd7a46c31dfb06d:
     - unable to to fetch specified GitFetch: refs/heads/master

fatal: couldn't find remote ref refs/heads/master
fatal: couldn't find remote ref refs/heads/master
 - friendica:
   - commit 8aa05541382295d09f2b4debf5c3d97e233f8599:
     - unable to to fetch specified GitFetch: refs/heads/master
   - commit 51dc7021f0f377a425de24ca32738b58f6867e0c:
     - unable to to fetch specified GitFetch: refs/heads/master

fatal: couldn't find remote ref refs/heads/master
fatal: couldn't find remote ref refs/heads/master
 - mono:
   - commit 490ebd19e006c00165baca7fbef00c9e98a96d34:
     - unable to to fetch specified GitFetch: refs/heads/master
   - commit a449b2a57e1cfadd098c2bcad13f89c4eab83e54:
     - unable to to fetch specified GitFetch: refs/heads/master

fatal: couldn't find remote ref refs/heads/master
 - nats:
   - commit fac2da22c58189a0778555d51753690abb4e0119:
     - unable to to fetch specified GitFetch: refs/heads/master

fatal: couldn't find remote ref refs/heads/master
 - nats-streaming:
   - commit 9890b00fab3d59a54653f90eb42f68c9458608c8:
     - unable to to fetch specified GitFetch: refs/heads/master

 - silverpeas:
   - commit 8577cb90ed86ef24248d1283f032c541a38d38ea:
     - is not in the specified ref GitFetch: refs/heads/master
   - commit e97e55f0a21aae880a0054ef764cea0cb37e1e05:
     - is not in the specified ref GitFetch: refs/heads/master

fatal: couldn't find remote ref refs/heads/master
fatal: couldn't find remote ref refs/heads/master
 - spiped:
   - commit bec455b320f878b386328c2db0cb9a6ca9fd7755:
     - unable to to fetch specified GitFetch: refs/heads/master
   - commit f97eba885ee67cd0d8a32f4e70ab5388bb77944f:
     - unable to to fetch specified GitFetch: refs/heads/master

fatal: couldn't find remote ref refs/heads/master
fatal: couldn't find remote ref refs/heads/master
fatal: couldn't find remote ref refs/heads/master
fatal: couldn't find remote ref refs/heads/master
fatal: couldn't find remote ref refs/heads/master
fatal: couldn't find remote ref refs/heads/master
fatal: couldn't find remote ref refs/heads/master
fatal: couldn't find remote ref refs/heads/master
 - swift:
   - commit 796768322dd8aadabf4d570a06b0beb9e1be55cb:
     - unable to to fetch specified GitFetch: refs/heads/master
   - commit a237eebf9da296be70616b32650fe032cee195fd:
     - unable to to fetch specified GitFetch: refs/heads/master
   - commit d58282b54afb6192de97d9cad973d2d2cc928dd5:
     - unable to to fetch specified GitFetch: refs/heads/master
   - commit 78d0a2dde09af579d06e2114a101fd90b01fbfb0:
     - unable to to fetch specified GitFetch: refs/heads/master
   - commit 78fb43bb44c727704436dd05bd4cc586c1e11aca:
     - unable to to fetch specified GitFetch: refs/heads/master
   - commit f0a61df2dd9a14dd6988e6017ae58cc63df37f41:
     - unable to to fetch specified GitFetch: refs/heads/master
   - commit c0daa8c7a96e310e20c4b02bbfaf600f2d92eda9:
     - unable to to fetch specified GitFetch: refs/heads/master
   - commit 05538e13a3015675d83e2553cdce5d1d67e17235:
     - unable to to fetch specified GitFetch: refs/heads/master

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.

A few minor style nits, but overall I like it 💪

…in the upstream GitFetch branch

Also update single-line library files to rfc2822 format to avoid 'refs/heads/*'
@github-actions
Copy link

github-actions bot commented Oct 8, 2021

Diff for a6b189f:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index c6d9a91..5d20376 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,33 +1,29 @@
 # sourcemage
 Maintainers: Vlad Glagolev <stealth@sourcemage.org> (@vaygr)
-GitFetch: refs/heads/*
+GitRepo: git://github.com/vaygr/docker-sourcemage
+GitFetch: refs/heads/dist-stable
 
 Tags: latest, 0.62
-GitRepo: git://github.com/vaygr/docker-sourcemage
 GitCommit: a03bbe3ae7bbb839c3c69afd4504ca336f7b9cb9
 Directory: stable
 
 
 # thrift
 Maintainers: Adam Hawkins <hi@ahawkins.me> (@ahawkins)
-GitFetch: refs/heads/*
+GitRepo: git://github.com/ahawkins/docker-thrift
 
 Tags: 0.9, 0.9.3
-GitRepo: git://github.com/ahawkins/docker-thrift
 GitCommit: d322572f7dd6ea468a14a4d832fbec26f152c71e
 Directory: 0.9
 
 Tags: 0.10, 0.10.0
-GitRepo: git://github.com/ahawkins/docker-thrift
 GitCommit: e1f81dfe3e8fac5588e12d2b880166d1743dbecd
 Directory: 0.10
 
 Tags: 0.11, 0.11.0
-GitRepo: git://github.com/ahawkins/docker-thrift
 GitCommit: 00e197d889426695446baec4e034b5ddbb15bcb3
 Directory: 0.11
 
 Tags: 0.12, 0.12.0, latest
-GitRepo: git://github.com/ahawkins/docker-thrift
 GitCommit: d7e73876549d205898b1922bcbf69e74ef11c288
 Directory: 0.12
diff --git a/_bashbrew.err b/_bashbrew.err
index 0b333ea..e69de29 100644
--- a/_bashbrew.err
+++ b/_bashbrew.err
@@ -1,5 +0,0 @@
-warning: insecure protocol git:// detected: git://github.com/vaygr/docker-sourcemage
-warning: insecure protocol git:// detected: git://github.com/ahawkins/docker-thrift
-warning: insecure protocol git:// detected: git://github.com/ahawkins/docker-thrift
-warning: insecure protocol git:// detected: git://github.com/ahawkins/docker-thrift
-warning: insecure protocol git:// detected: git://github.com/ahawkins/docker-thrift

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