Skip to content

Commit 0f485a7

Browse files
arschlesAaron Schlesinger
authored andcommitted
fix(build.go): remove unneeded variable and enhance builder pod naming
so that they’re more descriptive
1 parent 8a93c83 commit 0f485a7

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

pkg/gitreceive/build.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ func build(conf *Config, builderKey, gitSha string) error {
137137
// TMP_DIR=$(mktemp -d -p $BUILD_DIR)
138138
slugName := fmt.Sprintf("%s:git-%s", appName, shortSha)
139139
imageName := strings.Replace(slugName, ":", "-", -1)
140-
tmpImage := fmt.Sprintf("%s:%s/%s", conf.RegistryHost, conf.RegistryPort, imageName)
141140
if err := os.MkdirAll(buildDir, os.ModeDir); err != nil {
142141
return fmt.Errorf("making the build directory %s (%s)", buildDir, err)
143142
}
@@ -235,12 +234,12 @@ func build(conf *Config, builderKey, gitSha string) error {
235234
var buildPodName string
236235
var finalManifest string
237236
if usingDockerfile {
238-
buildPodName = fmt.Sprintf("%s-%s", tmpImage, uuid.New())
237+
buildPodName = fmt.Sprintf("dockerbuild-%s-%s", slugName, uuid.New())
239238
finalManifest = strings.Replace(string(fileBytes), "repo_name", buildPodName, -1)
240239
finalManifest = strings.Replace(finalManifest, "puturl", pushURL, -1)
241240
finalManifest = strings.Replace(finalManifest, "tar-url", tarURL, -1)
242241
} else {
243-
buildPodName = fmt.Sprintf("%s-%s", slugName, uuid.New())
242+
buildPodName = fmt.Sprintf("slugbuild-%s-%s", slugName, uuid.New())
244243
finalManifest = strings.Replace(string(fileBytes), "repo_name", buildPodName, -1)
245244
finalManifest = strings.Replace(finalManifest, "puturl", pushURL, -1)
246245
finalManifest = strings.Replace(finalManifest, "tar-url", tarURL, -1)

0 commit comments

Comments
 (0)