admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #11103 from Bo98/ghp-safer-inspect

Browse Source 
github_packages: safer handling of `skopeo inspect`
This commit is contained in:
Bo Anderson 2021-04-11 14:47:46 +01:00 committed by GitHub
commit bf79e3d29b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Library/Homebrew/github_packages.rb
View File

@ -227,16 +227,28 @@ class GitHubPackages
image_uri = "#{GitHubPackages.root_url(org, repo, DOCKER_PREFIX)}/#{image_name}:#{image_tag}" image_uri = "#{GitHubPackages.root_url(org, repo, DOCKER_PREFIX)}/#{image_name}:#{image_tag}"
puts puts
inspect_args = ["inspect", image_uri.to_s] inspect_args = ["inspect", "--raw", image_uri.to_s]
if dry_run if dry_run
puts "#{skopeo} #{inspect_args.join(" ")} --creds=#{user}:$HOMEBREW_GITHUB_PACKAGES_TOKEN" puts "#{skopeo} #{inspect_args.join(" ")} --creds=#{user}:$HOMEBREW_GITHUB_PACKAGES_TOKEN"
else else
inspect_args << "--creds=#{user}:#{token}" inspect_args << "--creds=#{user}:#{token}"
inspect_result = system_command(skopeo, print_stderr: false, args: inspect_args) inspect_result = system_command(skopeo, print_stderr: false, args: inspect_args)
if keep_old
# Tag doesn't exist so ignore --keep-old # Order here is important
if !inspect_result.status.success? && inspect_result.stderr.exclude?("name unknown")
# We got an error, and it was not about the tag or package being unknown.
if warn_on_error
opoo "#{image_uri} inspection returned an error, skipping upload!\n#{inspect_result.stderr}"
return
else
odie "#{image_uri} inspection returned an error!\n#{inspect_result.stderr}"
end
elsif keep_old
# If the tag doesn't exist, ignore --keep-old.
keep_old = false unless inspect_result.status.success? keep_old = false unless inspect_result.status.success?
# Otherwise, do nothing - the tag already existing is expected behaviour for --keep-old.
elsif inspect_result.status.success? elsif inspect_result.status.success?
# The tag already exists, and we are not passing --keep-old.
if warn_on_error if warn_on_error
opoo "#{image_uri} already exists, skipping upload!" opoo "#{image_uri} already exists, skipping upload!"
return return