Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support more types of image names #119

Merged
merged 12 commits into from
Oct 8, 2020
Merged

Support more types of image names #119

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
97bfea9
Support more types of image names
jgough Oct 7, 2020
b23ffdf
Detect registry correctly from the image name
jgough Oct 7, 2020
4978657
Add tests for buildPullOptions
jgough Oct 7, 2020
006e15e
Add missing import
jgough Oct 7, 2020
cba6530
New repository logic using go-dockerclient
jgough Oct 7, 2020
626040f
Updating tests for registry parsing
jgough Oct 7, 2020
6a69cd7
Separating registry parsing into other function
jgough Oct 7, 2020
3969fbf
Tests for new registry parsing code
jgough Oct 7, 2020
4fd2cc6
Merge registry parsing code
jgough Oct 7, 2020
b026402
Typo string->strings
jgough Oct 7, 2020
be980b4
Removing import no longer needed
jgough Oct 7, 2020
29aaf4c
improve parseRegistry
taraspos Oct 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
37 changes: 17 additions & 20 deletions core/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"fmt"
"io"
"reflect"
"strings"
"regexp"
"time"

docker "github.com/fsouza/go-dockerclient"
Expand Down Expand Up @@ -240,25 +240,22 @@ func buildFindLocalImageOptions(image string) docker.ListImagesOptions {
}

func buildPullOptions(image string) (docker.PullImageOptions, docker.AuthConfiguration) {
tag := "latest"
registry := ""

parts := strings.Split(image, ":")
if len(parts) == 2 {
tag = parts[1]
}

name := parts[0]
parts = strings.Split(name, "/")
if len(parts) > 2 {
registry = parts[0]
}

return docker.PullImageOptions{
Repository: name,
Registry: registry,
Tag: tag,
}, buildAuthConfiguration(registry)
re := regexp.MustCompile("((?:([^/]+\\.[^/]+)/)?[^:]+)(?::(.+))?")
matches := re.FindStringSubmatch(image)

repository := matches[1]
taraspos marked this conversation as resolved.
Show resolved Hide resolved
registry := matches[2]
tag := matches[3]

if tag == "" {
tag = "latest"
}

return docker.PullImageOptions{
Repository: repository,
Registry: registry,
Tag: tag,
}, buildAuthConfiguration(registry)
}

func buildAuthConfiguration(registry string) docker.AuthConfiguration {
Expand Down
24 changes: 24 additions & 0 deletions core/common_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"time"

. "gopkg.in/check.v1"
docker "github.com/fsouza/go-dockerclient"
)

func Test(t *testing.T) { TestingT(t) }
Expand Down Expand Up @@ -316,3 +317,26 @@ func (*TestLogger) Debugf(format string, args ...interface{}) {}
func (*TestLogger) Errorf(format string, args ...interface{}) {}
func (*TestLogger) Noticef(format string, args ...interface{}) {}
func (*TestLogger) Warningf(format string, args ...interface{}) {}

func (s *SuiteCommon) TestBuildPullOptions(c *C) {
var cases = map[string]docker.PullImageOptions{
"dir/image:tag": docker.PullImageOptions{Repository: "dir/image", Registry: "", Tag: "tag",},
"dir/image": docker.PullImageOptions{Repository: "dir/image", Registry: "", Tag: "latest",},
"image:tag": docker.PullImageOptions{Repository: "image", Registry: "", Tag: "tag",},
"image": docker.PullImageOptions{Repository: "image", Registry: "", Tag: "latest",},
"example.com/dir/image:tag": docker.PullImageOptions{Repository: "example.com/dir/image", Registry: "example.com", Tag: "tag",},
"example.com/dir/image": docker.PullImageOptions{Repository: "example.com/dir/image", Registry: "example.com", Tag: "latest",},
"example.com/image:tag": docker.PullImageOptions{Repository: "example.com/image", Registry: "example.com", Tag: "tag",},
"example.com/image": docker.PullImageOptions{Repository: "example.com/image", Registry: "example.com", Tag: "latest",},
"example.com:port/dir/image:tag": docker.PullImageOptions{Repository: "example.com:port/dir/image", Registry: "example.com:port", Tag: "tag",},
"example.com:port/dir/image": docker.PullImageOptions{Repository: "example.com:port/dir/image", Registry: "example.com:port", Tag: "latest",},
"example.com:port/image:tag": docker.PullImageOptions{Repository: "example.com:port/image", Registry: "example.com:port", Tag: "tag",},
"example.com:port/image": docker.PullImageOptions{Repository: "example.com:port/image", Registry: "example.com:port", Tag: "latest",},
}

for image, expected := range cases {
o, _ := buildPullOptions(image)
fmt.Println(image)
jgough marked this conversation as resolved.
Show resolved Hide resolved
c.Assert(o, Equals, expected)
}
}