oss/forgejo-runner
oss/forgejo-runner
1
0
Fork 0
mirror of https://code.forgejo.org/forgejo/runner.git synced 2025-09-15 18:57:01 +00:00
Code Wiki Activity

fix: use docker lib for image ref parsing (#877)

Browse source 
Signed-off-by: hackercat <me@hackerc.at>
This commit is contained in:
Ryan 2021-11-13 20:35:45 +01:00 • committed by GitHub
parent 3b382dde40
commit c82cbd5b5b
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
act/container/docker_pull.go
View file

@ -4,9 +4,8 @@ import (
"context"
"encoding/base64"
"encoding/json"
"fmt"
"strings"
"github.com/docker/distribution/reference"
"github.com/docker/docker/api/types"
"github.com/pkg/errors"
log "github.com/sirupsen/logrus"
@ -99,12 +98,11 @@ func getImagePullOptions(ctx context.Context, input NewDockerPullExecutorInput)
}
func cleanImage(image string) string {
imageParts := len(strings.Split(image, "/"))
if imageParts == 1 {
image = fmt.Sprintf("docker.io/library/%s", image)
} else if imageParts == 2 {
image = fmt.Sprintf("docker.io/%s", image)
ref, err := reference.ParseAnyReference(image)
if err != nil {
log.Error(err)
return ""
}
return image
return ref.String()
}

3
act/container/docker_pull_test.go
View file

@ -18,6 +18,9 @@ func TestCleanImage(t *testing.T) {
imageOut string
}{
{"myhost.com/foo/bar", "myhost.com/foo/bar"},
{"localhost:8000/canonical/ubuntu", "localhost:8000/canonical/ubuntu"},
{"localhost/canonical/ubuntu:latest", "localhost/canonical/ubuntu:latest"},
{"localhost:8000/canonical/ubuntu:latest", "localhost:8000/canonical/ubuntu:latest"},
{"ubuntu", "docker.io/library/ubuntu"},
{"ubuntu:18.04", "docker.io/library/ubuntu:18.04"},
{"cibuilds/hugo:0.53", "docker.io/cibuilds/hugo:0.53"},