Skip to content

Commit cfe8294

Browse files
arschlesAaron Schlesinger
authored andcommitted
fix(build.go,config.go): compute the image name
instead of requiring it as an env var
1 parent 0360b36 commit cfe8294

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

pkg/gitreceive/build.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ func build(conf *Config, etcdClient *etcd.Client) error {
141141
// # create temporary directory inside the build dir for this push
142142
// TMP_DIR=$(mktemp -d -p $BUILD_DIR)
143143
slugName := fmt.Sprintf("%s:git-%s", appName, shortSha)
144-
// metaName := strings.Replace(slugName, ":", "-", -1)
145-
tmpImage := fmt.Sprintf("%s:%s/%s", conf.RegistryHost, conf.RegistryPort, conf.ImageName)
144+
imageName := strings.Replace(slugName, ":", "-", -1)
145+
tmpImage := fmt.Sprintf("%s:%s/%s", conf.RegistryHost, conf.RegistryPort, imageName)
146146
if err := os.MkdirAll(buildDir, os.ModeDir); err != nil {
147147
return fmt.Errorf("making the build directory %s (%s)", buildDir, err)
148148
}

pkg/gitreceive/config.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,5 @@ type Config struct {
1515
Username string `envconfig:"username"`
1616
App string `envconfing:"app"`
1717
Fingerprint string `envconfing:"fingerprint"`
18-
ImageName string `envconfig:"image_name"`
1918
PodNamespace string `envconfig:"pod_namespace"`
2019
}

0 commit comments

Comments
 (0)