docker-library
/
bashbrew
mirror of https://github.com/docker-library/bashbrew.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adjust "bashbrew" namespace sorting to account for more edge cases 

In particular, our namespace changes made `bashbrew list --build-order wordpress php` work properly but `bashbrew --namespace amd64 list --build-order wordpress php` does not -- these changes adjust our sorting to take into account both the namespaced and the non-namespaced version of each tag in our library when checking the `FROM` values for sorting purposes.
This commit is contained in:
Tianon Gravi 2019-09-06 17:42:50 -07:00
parent 40f10346a4
commit 8d6444a1af
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
go/src/bashbrew/sort.go
View File

@ -79,7 +79,12 @@ func sortRepoObjects(rs []*Repo, applyConstraints bool) ([]*Repo, error) {
for _, r := range rs {
node := r.Identifier()
for _, entry := range r.Entries() {
for _, tag := range r.Tags(namespace, false, entry) {
// add edges both with and without namespace so sorting still works properly for official images ("bashbrew --namespace amd64 list --build-order wordpress php")
// this should be reasonably harmless for other use cases of --namespace but catches things like "tianon/foo -> tianon/bar" and things like "php -> wordpress" equally even if we're building to target a different namespace
tags := []string{}
tags = append(tags, r.Tags("", false, entry)...)
tags = append(tags, r.Tags(namespace, false, entry)...)
for _, tag := range tags {
if canonicalRepo, ok := canonicalRepos[tag]; ok && canonicalRepo.TagName != "" {
// if we run into a duplicate, we want to prefer a specific tag over a full repo
continue