go/goreleaser
go/goreleaser
1
0
Fork 0
mirror of https://github.com/goreleaser/goreleaser.git synced 2025-03-17 20:47:50 +02:00
Code Issues Releases Activity

refactor: use the variable from artifact

Browse Source 
refs #3496

Signed-off-by: Carlos A Becker <caarlos0@users.noreply.github.com>
This commit is contained in:
Carlos A Becker 2022-11-15 08:29:01 -03:00
parent 4863781b48
commit 33ea55b8e6
No known key found for this signature in database
GPG Key ID: E61E2F7DC14AB940
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
internal/pipe/docker/docker.go
View File

@ -20,7 +20,6 @@ import (
const (
dockerConfigExtra = "DockerConfig"
dockerDigestExtra = artifact.ExtraDigest
useBuildx = "buildx"
useDocker = "docker"

6
internal/pipe/docker/docker_test.go
View File

@ -1094,7 +1094,7 @@ func TestRunPipe(t *testing.T) {
}
_ = ctx.Artifacts.Filter(artifact.ByType(artifact.DockerImage)).Visit(func(a *artifact.Artifact) error {
digest, err := artifact.Extra[string](*a, dockerDigestExtra)
digest, err := artifact.Extra[string](*a, artifact.ExtraDigest)
require.NoError(t, err)
require.NotEmpty(t, digest)
return nil
@ -1430,14 +1430,14 @@ func TestWithDigest(t *testing.T) {
Name: "owner/img:t1",
Type: artifact.DockerImage,
Extra: artifact.Extras{
dockerDigestExtra: "sha256:d1",
artifact.ExtraDigest: "sha256:d1",
},
})
artifacts.Add(&artifact.Artifact{
Name: "owner/img:t2",
Type: artifact.DockerImage,
Extra: artifact.Extras{
dockerDigestExtra: "sha256:d2",
artifact.ExtraDigest: "sha256:d2",
},
})
artifacts.Add(&artifact.Artifact{

2
internal/pipe/docker/manifest.go
View File

@ -134,7 +134,7 @@ func manifestImages(ctx *context.Context, manifest config.DockerManifest) ([]str
func withDigest(name string, images []*artifact.Artifact) string {
for _, art := range images {
if art.Name == name {
if digest := artifact.ExtraOr(*art, dockerDigestExtra, ""); digest != "" {
if digest := artifact.ExtraOr(*art, artifact.ExtraDigest, ""); digest != "" {
return name + "@" + digest
}
break