compose: ensure dockerfile is unique per config

Author: featheredtoast

docker_compose.go

@@ -90,7 +90,7 @@ func WriteDockerCompose(config config.Config, dir string, bakeEnv bool) error {
 			App: ComposeService{
 				Image: utils.DefaultNamespace + "/" + config.Name,
 				Build: ComposeBuild{
-					Dockerfile: "./Dockerfile",
+					Dockerfile: "./" + config.Name + ".dockerfile",
 					Labels:     labels,
 					Shm_Size:   "512m",
 					Args:       args,
@@ -124,7 +124,7 @@ func WriteDockerfile(config config.Config, dir string, pupsArgs string, bakeEnv
 		return err
 	}
 
-	file := strings.TrimRight(dir, "/") + "/" + "Dockerfile"
+	file := strings.TrimRight(dir, "/") + "/" + config.Name + ".dockerfile"
 	if err := os.WriteFile(file, []byte(config.Dockerfile(pupsArgs, bakeEnv)), 0660); err != nil {
 		return errors.New("error writing dockerfile Dockerfile " + file)
 	}

main_test.go

@@ -64,13 +64,14 @@ var _ = Describe("Generate", func() {
 		out, err = os.ReadFile(testDir + "/config.yaml")
 		Expect(err).To(BeNil())
 		Expect(string(out[:])).To(ContainSubstring("DISCOURSE_DEVELOPER_EMAILS: '[email protected],[email protected]'"))
-		out, err = os.ReadFile(testDir + "/Dockerfile")
+		out, err = os.ReadFile(testDir + "/test.dockerfile")
 		Expect(err).To(BeNil())
 		Expect(string(out[:])).To(ContainSubstring("RUN cat /temp-config.yaml"))
 
 		out, err = os.ReadFile(testDir + "/docker-compose.yaml")
 		Expect(err).To(BeNil())
 		Expect(string(out[:])).To(ContainSubstring("build:"))
+		Expect(string(out[:])).To(ContainSubstring("dockerfile: ./test.dockerfile"))
 		Expect(string(out[:])).To(ContainSubstring("image: local_discourse/test"))
 	})
 })