tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #999 from gtardif/compose_build_flags 

Add compose build flags for file and working dir
This commit is contained in:
Guillaume Tardif 2020-12-02 11:18:43 +01:00 committed by GitHub
parent 6bf76eebb1 5258e3d56e
commit 1d71be31b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cli/cmd/compose/build.go
View File

@ -38,6 +38,9 @@ func buildCommand() *cobra.Command {
return runBuild(cmd.Context(), opts, args)
},
}
buildCmd.Flags().StringVar(&opts.WorkingDir, "workdir", "", "Work dir")
buildCmd.Flags().StringArrayVarP(&opts.ConfigPaths, "file", "f", []string{}, "Compose configuration files")
return buildCmd
}

7
local/e2e/compose_test.go
View File

@ -37,6 +37,13 @@ func TestLocalBackendComposeUp(t *testing.T) {
networkList := c.RunDockerCmd("--context", "default", "network", "ls")
t.Run("build", func(t *testing.T) {
res := c.RunDockerCmd("compose", "build", "-f", "../../tests/composefiles/demo_multi_port.yaml")
res.Assert(t, icmd.Expected{Out: "COPY words.sql /docker-entrypoint-initdb.d/"})
res.Assert(t, icmd.Expected{Out: "COPY pom.xml ."})
res.Assert(t, icmd.Expected{Out: "COPY static /static/"})
})
t.Run("up", func(t *testing.T) {
c.RunDockerCmd("compose", "up", "-f", "../../tests/composefiles/demo_multi_port.yaml", "--project-name", projectName)
})