Fix image tag addition.
diff --git a/pkg/util/docker/docker.go b/pkg/util/docker/docker.go
index e4d6a1f..bc83045 100644
--- a/pkg/util/docker/docker.go
+++ b/pkg/util/docker/docker.go
@@ -102,12 +102,12 @@
}
// RunIntegrationImageArgs --
-func RunIntegrationImageArgs(image string) []string {
+func RunIntegrationImageArgs(imagePath string) []string {
// Construct the docker command:
//
// docker run --network="host" <dockerRegistry>/<ImageName>
//
- return RunImageArgs(image, latestTag)
+ return RunImageArgs(imagePath, latestTag)
}
// GetContainerWorkspaceDir -- directory inside the container where all the integration files are copied.
diff --git a/pkg/util/docker/docker_base.go b/pkg/util/docker/docker_base.go
index e1ed17a..0149a6c 100644
--- a/pkg/util/docker/docker_base.go
+++ b/pkg/util/docker/docker_base.go
@@ -64,7 +64,7 @@
}
// RunImageArgs -- standard docker run arguments.
-func RunImageArgs(imageName string, imageTag string) []string {
+func RunImageArgs(imagePath string, imageTag string) []string {
// Construct the docker command:
//
// docker run --network="host" <image-name>:<tag>
@@ -77,7 +77,7 @@
args = append(args, "--network=host")
// Path to Docker image:
- args = append(args, ImageArg(imageName, imageTag)...)
+ args = append(args, FullImageArg(imagePath)...)
return args
}
@@ -110,6 +110,18 @@
return args
}
+// FullImageArg --
+func FullImageArg(dockerImage string) []string {
+ imageComponents := strings.Split(dockerImage, ":")
+ if len(imageComponents) == 2 {
+ // Image has a tag already.
+ return ImageArg(imageComponents[0], imageComponents[1])
+ }
+
+ // Image has no tag, latest tag will be added automatically.
+ return LatestImageArg(dockerImage)
+}
+
//
// Docker-spcific helper functions.
//
@@ -130,7 +142,13 @@
// GetFullDockerImage - <docker-registry>/<image-name>:<tag>
func GetFullDockerImage(dockerImageName string, tag string) string {
fullImagePath := make([]string, 0)
- fullImagePath = append(fullImagePath, RegistryName)
+
+ // If register is specified, add it.
+ if RegistryName != "" {
+ fullImagePath = append(fullImagePath, RegistryName)
+ }
+
+ // Add image and tag.
if tag == "" {
fullImagePath = append(fullImagePath, dockerImageName)
} else {
@@ -199,13 +217,6 @@
return strings.Join(c, " ")
}
-// // COPYFromBuilder --
-// func COPYFromBuilder(from string, to string) string {
-// flag := []string{"--from", internalBuilderImageName}
-// newFrom := []string{strings.Join(flag, "="), from}
-// return COPY(strings.Join(newFrom, " "), to)
-// }
-
// RUNMavenInstall --
func RUNMavenInstall() string {
return RUN("apk add --update maven && apk update && apk upgrade")
