mirror of
https://code.forgejo.org/forgejo/runner.git
synced 2025-09-15 18:57:01 +00:00
fix: use docker lib for image ref parsing (#877)
Signed-off-by: hackercat <me@hackerc.at>
This commit is contained in:
parent
3b382dde40
commit
c82cbd5b5b
2 changed files with 9 additions and 8 deletions
|
@ -4,9 +4,8 @@ import (
|
||||||
"context"
|
"context"
|
||||||
"encoding/base64"
|
"encoding/base64"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
|
"github.com/docker/distribution/reference"
|
||||||
"github.com/docker/docker/api/types"
|
"github.com/docker/docker/api/types"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
|
@ -99,12 +98,11 @@ func getImagePullOptions(ctx context.Context, input NewDockerPullExecutorInput)
|
||||||
}
|
}
|
||||||
|
|
||||||
func cleanImage(image string) string {
|
func cleanImage(image string) string {
|
||||||
imageParts := len(strings.Split(image, "/"))
|
ref, err := reference.ParseAnyReference(image)
|
||||||
if imageParts == 1 {
|
if err != nil {
|
||||||
image = fmt.Sprintf("docker.io/library/%s", image)
|
log.Error(err)
|
||||||
} else if imageParts == 2 {
|
return ""
|
||||||
image = fmt.Sprintf("docker.io/%s", image)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return image
|
return ref.String()
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,6 +18,9 @@ func TestCleanImage(t *testing.T) {
|
||||||
imageOut string
|
imageOut string
|
||||||
}{
|
}{
|
||||||
{"myhost.com/foo/bar", "myhost.com/foo/bar"},
|
{"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", "docker.io/library/ubuntu"},
|
||||||
{"ubuntu:18.04", "docker.io/library/ubuntu:18.04"},
|
{"ubuntu:18.04", "docker.io/library/ubuntu:18.04"},
|
||||||
{"cibuilds/hugo:0.53", "docker.io/cibuilds/hugo:0.53"},
|
{"cibuilds/hugo:0.53", "docker.io/cibuilds/hugo:0.53"},
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue