darkkirb/harness-drone
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1010 from masarakki/image-with-hostname

Browse source 
enable to specify image with hostname
This commit is contained in:
Brad Rydzewski 2015-05-31 13:04:27 -07:00
commit 64a0658fbd
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
shared/build/util.go
View file

@ -68,7 +68,10 @@ func parseImageName(image string) (owner, name, tag string) {
} }
parts := strings.Split(name, "/") parts := strings.Split(name, "/")
if len(parts) == 2 { if len := len(parts); len == 3 {
owner = fmt.Sprintf("%s/%s", parts[0], parts[1])
name = parts[2]
} else if len == 2 {
owner = parts[0] owner = parts[0]
name = parts[1] name = parts[1]
} }

2
shared/build/util_test.go
View file

@ -15,6 +15,8 @@ func TestParseImageName(t *testing.T) {
{"johnsmith", "redis", "latest", "johnsmith/redis"}, {"johnsmith", "redis", "latest", "johnsmith/redis"},
// image name with no owner specified // image name with no owner specified
{"bradrydzewski", "redis", "2.8", "redis:2.8"}, {"bradrydzewski", "redis", "2.8", "redis:2.8"},
// image name with hostname
{"docker.example.com/johnsmith", "redis", "latest", "docker.example.com/johnsmith/redis"},
// image name with ownly name specified // image name with ownly name specified
{"bradrydzewski", "redis2", "latest", "redis2"}, {"bradrydzewski", "redis2", "latest", "redis2"},
// image name that is a known alias // image name that is a known alias