diff --git a/cmd/ci.go b/cmd/ci.go index 576bfbe89491b55c627bfd1040bb7aa0edc5b8bb..61dd5f8400658c4cf7addf1e90e92988ffd50af4 100644 --- a/cmd/ci.go +++ b/cmd/ci.go @@ -42,12 +42,12 @@ func init() { // configCmd.PersistentFlags().String("foo", "", "A help for foo") ciCmd.PersistentFlags().StringVarP(&dockerRegistry, "registry", "r", "", "url of the docker registry") ciCmd.PersistentFlags().StringVarP(&dockerRegistryNamespace, "registry-namespace", "n", "", "namespace in the docker registry") - ciCmd.PersistentFlags().StringVarP(&imageTag, "image", "i", "", "image tag for docker") + ciCmd.PersistentFlags().StringVarP(&imageTag, "image-tag", "i", "", "image tag for docker") ciCmd.PersistentFlags().StringVarP(&environmentSuffix, "environment", "e", "", "environment suffix to append to helm release name") ciCmd.MarkPersistentFlagRequired("registry") ciCmd.MarkPersistentFlagRequired("registry-namespace") - ciCmd.MarkPersistentFlagRequired("image") + ciCmd.MarkPersistentFlagRequired("image-tag") // Cobra supports local flags which will only run when this command // is called directly, e.g.: diff --git a/cmd/ci_deploy.go b/cmd/ci_deploy.go index 35e068f10df8bb33e58717ffcc13f753c458b56a..6021a5a4737ef76df72f93b1b1252641ba01ebb0 100644 --- a/cmd/ci_deploy.go +++ b/cmd/ci_deploy.go @@ -63,8 +63,7 @@ func fluxDeployCi(config config.Config) error { for _, deployable := range config.Deployables { image := deployable.Name - dockerImage := dockerRegistry + "/" + dockerRegistryNamespace + "/" + image - dockerTag := dockerImage + ":" + imageTag + dockerImageTag := image + ":" + imageTag var releaseName string if environmentSuffix == "" { @@ -75,7 +74,7 @@ func fluxDeployCi(config config.Config) error { color.Blue("Updating Flux Release:", releaseName) os.Setenv("KUBE_SERVICE_NAME", releaseName) - os.Setenv("DOCKER_IMAGE_TAG", dockerTag) + os.Setenv("DOCKER_IMAGE_TAG", dockerImageTag) os.Setenv("CI_PROJECT_NAME", image) err := environment.Run(true, "fluxhelmrelease")