-
Notifications
You must be signed in to change notification settings - Fork 513
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
Refactor multiarch support to go all the way to correct Architectures lines in "generate-stackbrew-library.sh" #163
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| _awkArch() { | ||
| local version="$1"; shift | ||
| local awkExpr="$1"; shift | ||
| awk "$@" "/^#|^\$/ { next } $awkExpr" "$version/release-architectures" | ||
| } | ||
|
|
||
| dpkgArches() { | ||
| local version="$1"; shift | ||
| _awkArch "$version" '{ print $2 }' | ||
| } | ||
|
|
||
| hasBashbrewArch() { | ||
| local version="$1"; shift | ||
| local bashbrewArch="$1"; shift | ||
| _awkArch "$version" 'BEGIN { exitCode = 1 } $1 == bashbrewArch { exitCode = 0 } END { exit exitCode }' -v bashbrewArch="$bashbrewArch" | ||
| } | ||
|
|
||
| dpkgToGoArch() { | ||
| local version="$1"; shift | ||
| local dpkgArch="$1"; shift | ||
| _awkArch "$version" '$2 == dpkgArch { print $3; exit }' -v dpkgArch="$dpkgArch" | ||
| } | ||
|
|
||
| _generateParentRepoToArches() { | ||
| local repo="$1"; shift | ||
| local officialImagesUrl='https://github.com/docker-library/official-images/raw/master/library/' | ||
|
|
||
| eval "declare -g -A parentRepoToArches=( $( | ||
| find -name 'Dockerfile' -exec awk ' | ||
| toupper($1) == "FROM" && $2 !~ /^('"$repo"'|scratch|microsoft\/[^:]+)(:|$)/ { | ||
| print "'"$officialImagesUrl"'" $2 | ||
| } | ||
| ' '{}' + \ | ||
| | sort -u \ | ||
| | xargs bashbrew cat --format '[{{ .RepoName }}:{{ .TagName }}]="{{ join " " .TagEntry.Architectures }}"' | ||
| ) )" | ||
| } | ||
| _generateParentRepoToArches 'golang' | ||
|
|
||
| parentArches() { | ||
| local version="$1"; shift # "1.8", etc | ||
| local variant="$1"; shift # "", "stretch", etc | ||
|
|
||
| local parent="$(awk 'toupper($1) == "FROM" { print $2 }' "$version/$variant/Dockerfile")" | ||
| echo "${parentRepoToArches[$parent]:-}" | ||
| } | ||
| variantArches() { | ||
| local version="$1"; shift # "1.8", etc | ||
| local variant="$1"; shift # "", "stretch", etc | ||
|
|
||
| local parentArches="$(parentArches "$version" "$variant")" | ||
|
|
||
| local variantArches=() | ||
| for arch in $parentArches; do | ||
| if hasBashbrewArch "$version" "$arch"; then | ||
| variantArches+=( "$arch" ) | ||
| fi | ||
| done | ||
| echo "${variantArches[*]}" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| # see https://golang.org/dl/ | ||
|
|
||
| # bashbrew-arch dpkg-arch golang-release-arch | ||
| amd64 amd64 amd64 | ||
| arm32v7 armhf armv6l | ||
| i386 i386 386 | ||
| ppc64le ppc64el ppc64le | ||
| s390x s390x s390x |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| # see https://golang.org/dl/ | ||
|
|
||
| # bashbrew-arch dpkg-arch golang-release-arch | ||
| amd64 amd64 amd64 | ||
| arm32v7 armhf armv6l | ||
| i386 i386 386 | ||
| ppc64le ppc64el ppc64le | ||
| s390x s390x s390x |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yay for better output ordering 😄