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

github_packages: remove invalid docker tag characters.

Browse Source 
Some versions have `+` in them.
This commit is contained in:
Mike McQuaid 2021-04-07 13:31:41 +01:00
parent c8fbfdd3b7
commit d707c0bbd8
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Library/Homebrew/github_packages.rb
View File

@ -110,6 +110,11 @@ class GitHubPackages
.tr("+", "x") .tr("+", "x")
end end
def self.image_version_rebuild(version_rebuild)
# invalid docker tag characters
version_rebuild.tr("+", ".")
end
private private
IMAGE_CONFIG_SCHEMA_URI = "https://opencontainers.org/schema/image/config" IMAGE_CONFIG_SCHEMA_URI = "https://opencontainers.org/schema/image/config"
@ -183,11 +188,12 @@ class GitHubPackages
rebuild = bottle_hash["bottle"]["rebuild"] rebuild = bottle_hash["bottle"]["rebuild"]
version_rebuild = GitHubPackages.version_rebuild(version, rebuild) version_rebuild = GitHubPackages.version_rebuild(version, rebuild)
image_formula_name = GitHubPackages.image_formula_name(formula_name) image_name = GitHubPackages.image_formula_name(formula_name)
image_tag = "#{GitHubPackages.root_url(org, repo, DOCKER_PREFIX)}/#{image_formula_name}:#{version_rebuild}" image_tag = GitHubPackages.image_version_rebuild(version_rebuild)
image_uri = "#{GitHubPackages.root_url(org, repo, DOCKER_PREFIX)}/#{image_name}:#{image_tag}"
puts puts
inspect_args = ["inspect", image_tag.to_s] inspect_args = ["inspect", image_uri.to_s]
if dry_run if dry_run
puts "#{skopeo} #{inspect_args.join(" ")} --dest-creds=#{user}:$HOMEBREW_GITHUB_PACKAGES_TOKEN" puts "#{skopeo} #{inspect_args.join(" ")} --dest-creds=#{user}:$HOMEBREW_GITHUB_PACKAGES_TOKEN"
else else
@ -195,10 +201,10 @@ class GitHubPackages
inspect_result = system_command(skopeo, args: args) inspect_result = system_command(skopeo, args: args)
if inspect_result.status.success? if inspect_result.status.success?
if warn_on_error if warn_on_error
opoo "#{image_tag} already exists, skipping upload!" opoo "#{image_uri} already exists, skipping upload!"
return return
else else
odie "#{image_tag} already exists!" odie "#{image_uri} already exists!"
end end
end end
end end
@ -343,7 +349,7 @@ class GitHubPackages
"org.opencontainers.image.ref.name" => version_rebuild) "org.opencontainers.image.ref.name" => version_rebuild)
puts puts
args = ["copy", "--all", "oci:#{root}", image_tag.to_s] args = ["copy", "--all", "oci:#{root}", image_uri.to_s]
if dry_run if dry_run
puts "#{skopeo} #{args.join(" ")} --dest-creds=#{user}:$HOMEBREW_GITHUB_PACKAGES_TOKEN" puts "#{skopeo} #{args.join(" ")} --dest-creds=#{user}:$HOMEBREW_GITHUB_PACKAGES_TOKEN"
else else

3
Library/Homebrew/software_spec.rb
View File

@ -403,7 +403,8 @@ class Bottle
resource.version(version_rebuild) resource.version(version_rebuild)
image_name = GitHubPackages.image_formula_name(@name) image_name = GitHubPackages.image_formula_name(@name)
resource.url("#{@spec.root_url}/#{image_name}/manifests/#{version_rebuild}", { image_tag = GitHubPackages.image_version_rebuild(version_rebuild)
resource.url("#{@spec.root_url}/#{image_name}/manifests/#{image_tag}", {
using: CurlGitHubPackagesDownloadStrategy, using: CurlGitHubPackagesDownloadStrategy,
headers: ["Accept: application/vnd.oci.image.index.v1+json"], headers: ["Accept: application/vnd.oci.image.index.v1+json"],
}) })