Merge pull request #18 from mnottale/rename-services-to-docker-compose

Rename services.yml into docker-compose.yml

Author: mnottale

e2e/render/envvariables.docker-app/services.yml renamed to e2e/render/envvariables.docker-app/docker-compose.yml

@@ -188,14 +188,14 @@ $ rm -rf simple.docker-app
 $ docker-app load simple.docker-app
 $ tar -tf simple.docker-app  # TODO: should unpack automatically?
 metadata.yml
-services.yml
+docker-compose.yml
 settings.yml
 $ mv simple.docker-app simple  # TODO: fix UX
 $ docker-app unpack simple
 $ tree simple.docker-app
 ./simple.docker-app/
 ├── metadata.yml
-├── services.yml
+├── docker-compose.yml
 └── settings.yml
 
 0 directories, 3 files
@@ -209,7 +209,7 @@ $ tree simple.docker-app
 $ docker-app pack simple -o myapp.tar
 $ tar -tf myapp.tar
 metadata.yml
-services.yml
+docker-compose.yml
 settings.yml
 ```
 

e2e/render/templates.docker-app/services.yml renamed to e2e/render/templates.docker-app/docker-compose.yml

@@ -55,7 +55,7 @@ Examples of possible values: java, mysql, redis, ruby, postgres, rabbitmq...`)
 	}
 
 	dirName := utils.DirNameFromAppName(name)
-	if err := utils.CreateFileWithData(path.Join(dirName, "services.yml"), composeData); err != nil {
+	if err := utils.CreateFileWithData(path.Join(dirName, "docker-compose.yml"), composeData); err != nil {
 		return err
 	}
 	return utils.CreateFileWithData(path.Join(dirName, "settings.yml"), []byte{'\n'})
@@ -69,7 +69,7 @@ func initFromComposeFiles(name string, composeFiles []string, merger ComposeConf
 	if err != nil {
 		return err
 	}
-	if err = utils.CreateFileWithData(path.Join(dirName, "services.yml"), composeConfig); err != nil {
+	if err = utils.CreateFileWithData(path.Join(dirName, "docker-compose.yml"), composeConfig); err != nil {
 		return err
 	}
 	return utils.CreateFileWithData(path.Join(dirName, "settings.yml"), []byte{'\n'})

examples/simple/README.md

@@ -78,7 +78,7 @@ func TestInitFromComposeFiles(t *testing.T) {
 	manifest := fs.Expected(
 		t,
 		fs.WithMode(0755),
-		fs.WithFile("services.yml", dummyComposeData, fs.WithMode(0644)),
+		fs.WithFile("docker-compose.yml", dummyComposeData, fs.WithMode(0644)),
 		fs.WithFile("settings.yml", "\n", fs.WithMode(0644)),
 	)
 

packager/init.go

@@ -61,7 +61,7 @@ func Pack(appname, output string) error {
 		}
 	}
 	tarout := tar.NewWriter(target)
-	files := []string{"metadata.yml", "services.yml", "settings.yml"}
+	files := []string{"metadata.yml", "docker-compose.yml", "settings.yml"}
 	for _, f := range files {
 		err = tarAdd(tarout, f, path.Join(appname, f))
 		if err != nil {

packager/init_test.go

@@ -27,7 +27,7 @@ func Save(appname, prefix, tag string) error {
 	defer cleanup()
 	dockerfile := `
 FROM scratch
-COPY services.yml settings.yml metadata.yml /
+COPY docker-compose.yml settings.yml metadata.yml /
 `
 	df := path.Join(appname, "__Dockerfile-docker-app__")
 	ioutil.WriteFile(df, []byte(dockerfile), 0644)

packager/packing.go

@@ -119,7 +119,7 @@ func Render(appname string, composeFiles []string, settingsFile []string, env ma
 	finalEnv := make(map[string]string)
 	flatten(settings, finalEnv, "")
 	// prepend our app compose file to the list
-	composes := []string{path.Join(appname, "services.yml")}
+	composes := []string{path.Join(appname, "docker-compose.yml")}
 	composes = append(composes, composeFiles...)
 	// go-template, then parse, then expand the compose files
 	configFiles := []composetypes.ConfigFile{}