Skip to content

Commit 7bdfd48

Browse files
committed
Prefix option
1 parent 16f3a37 commit 7bdfd48

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

cmd/ciImageBuild.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ var ciImageBuildCmd = &cobra.Command{
2828
branchName, _ := cmd.Flags().GetString("branchname")
2929
imageIdentifier, _ := cmd.Flags().GetString("image-identifier")
3030
imageTag, _ := cmd.Flags().GetString("image-tag")
31+
imageTagPrefix, _ := cmd.Flags().GetString("image-tag-prefix")
3132
dockerfile, _ := cmd.Flags().GetString("dockerfile")
3233
reuseExisting, _ := cmd.Flags().GetBool("image-reuse")
3334
buildPath, _ := cmd.Flags().GetString("build-path")
@@ -85,6 +86,11 @@ var ciImageBuildCmd = &cobra.Command{
8586
// Unless golang calculates checksum itself, passing plain output uses just too much memory.
8687
imageTag = string(fileListing)
8788

89+
// Add prefix if it is specified
90+
if len(imageTagPrefix) > 0 {
91+
imageTag = imageTagPrefix + string('-') + imageTag
92+
}
93+
8894
// Calculate hash sum
8995
// sha1_hash := fmt.Sprintf("%x", sha1.Sum([]byte(fileListing)))
9096
// imageTag = sha1_hash[0:40]
@@ -236,6 +242,7 @@ func init() {
236242
ciImageBuildCmd.Flags().String("branchname", "", "Branch name (used as an extra tag for image identification)")
237243
ciImageBuildCmd.Flags().String("image-identifier", "", "Docker image identifier (i.e. \"php\")")
238244
ciImageBuildCmd.Flags().String("image-tag", "", "Docker image tag (optional, check '--image-reuse' flag)")
245+
ciImageBuildCmd.Flags().String("image-tag-prefix", "", "Prefix for Docker image tag (optional)")
239246
ciImageBuildCmd.Flags().String("dockerfile", "", "Dockerfile (relative path)")
240247
ciImageBuildCmd.Flags().String("build-path", "", "Docker image build path")
241248
ciImageBuildCmd.Flags().Bool("image-reuse", true, "Do not rebuild image if identical image:tag exists in remote")

cmd/ciImageUrl.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ var ciImageUrlCmd = &cobra.Command{
2222
namespace, _ := cmd.Flags().GetString("namespace")
2323
imageIdentifier, _ := cmd.Flags().GetString("image-identifier")
2424
imageTag, _ := cmd.Flags().GetString("image-tag")
25+
imageTagPrefix, _ := cmd.Flags().GetString("image-tag-prefix")
2526
dockerfile, _ := cmd.Flags().GetString("dockerfile")
2627
buildPath, _ := cmd.Flags().GetString("build-path")
2728

@@ -79,6 +80,11 @@ var ciImageUrlCmd = &cobra.Command{
7980
// Unless golang calculates checksum itself, passing plain output uses just too much memory.
8081
imageTag = string(fileListing)
8182

83+
// Add prefix if it is specified
84+
if len(imageTagPrefix) > 0 {
85+
imageTag = imageTagPrefix + string('-') + imageTag
86+
}
87+
8288
// Calculate hash sum
8389
// sha1_hash := fmt.Sprintf("%x", sha1.Sum([]byte(fileListing)))
8490
// imageTag = sha1_hash[0:40]
@@ -98,6 +104,7 @@ func init() {
98104
ciImageUrlCmd.Flags().String("namespace", "", "Project name (namespace, i.e. \"drupal-project\")")
99105
ciImageUrlCmd.Flags().String("image-identifier", "", "Docker image identifier (i.e. \"php\")")
100106
ciImageUrlCmd.Flags().String("image-tag", "", "Docker image tag (optional)")
107+
ciImageUrlCmd.Flags().String("image-tag-prefix", "", "Prefix for Docker image tag (optional)")
101108
ciImageUrlCmd.Flags().String("dockerfile", "", "Dockerfile (relative path)")
102109
ciImageUrlCmd.Flags().String("build-path", "", "Docker image build path")
103110

0 commit comments

Comments
 (0)