Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.

Commit 65f2d38

Browse files
committed
Make parameters file flag singular
This brings it inline with other flags that can be called multiple times in the Docker CLI. Signed-off-by: Christopher Crone <[email protected]>
1 parent 46de296 commit 65f2d38

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

e2e/commands_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func testRenderApp(appPath string, env ...string) func(*testing.T) {
6060
data, err := ioutil.ReadFile(filepath.Join(appPath, "env.yml"))
6161
assert.NilError(t, err)
6262
assert.NilError(t, yaml.Unmarshal(data, &envParameters))
63-
args := dockerCli.Command("app", "render", filepath.Join(appPath, "my.dockerapp"), "--parameters-files", filepath.Join(appPath, "parameters-0.yml"))
63+
args := dockerCli.Command("app", "render", filepath.Join(appPath, "my.dockerapp"), "--parameters-file", filepath.Join(appPath, "parameters-0.yml"))
6464
for k, v := range envParameters {
6565
args = append(args, "--set", fmt.Sprintf("%s=%s", k, v))
6666
}

examples/voting-app/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ cleanup: cleanup/production cleanup/development
2424
#
2525
render/production: cleanup/production
2626
@mkdir -p $(PRODUCTION_DIR)
27-
docker-app render --parameters-files $(PARAMETERS_DIR)/production.yml > $(PRODUCTION_DIR)/docker-compose.yml
27+
docker-app render --parameters-file $(PARAMETERS_DIR)/production.yml > $(PRODUCTION_DIR)/docker-compose.yml
2828

2929
render/development: cleanup/development
3030
@mkdir -p $(DEVELOPMENT_DIR)
31-
docker-app render --parameters-files $(PARAMETERS_DIR)/development.yml > $(DEVELOPMENT_DIR)/docker-compose.yml
31+
docker-app render --parameters-file $(PARAMETERS_DIR)/development.yml > $(DEVELOPMENT_DIR)/docker-compose.yml
3232

3333
render: render/production render/development
3434

@@ -47,10 +47,10 @@ stop: stop/production stop/development
4747
# Deploy.
4848
#
4949
deploy/production: render/production stop/production
50-
docker-app deploy --parameters-files $(PARAMETERS_DIR)/production.yml
50+
docker-app deploy --parameters-file $(PARAMETERS_DIR)/production.yml
5151

5252
deploy/development: render/development stop/development
53-
docker-app deploy --parameters-files $(PARAMETERS_DIR)/development.yml
53+
docker-app deploy --parameters-file $(PARAMETERS_DIR)/development.yml
5454

5555
#
5656
# Pack.

examples/wordpress/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ volumes:
5454
**Override default parameters with file**. This example sets `debug` to `"false"` and the wordpress service published port to 80 as defined in `prod-parameters.yml`.
5555

5656
```yaml
57-
# docker-app render wordpress --parameters-files prod-parameters.yml
57+
# docker-app render wordpress --parameters-file prod-parameters.yml
5858
version: "3.6"
5959
[...]
6060
environment:

internal/commands/root.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ type parametersOptions struct {
8383
}
8484

8585
func (o *parametersOptions) addFlags(flags *pflag.FlagSet) {
86-
flags.StringArrayVarP(&o.parametersFiles, "parameters-files", "f", []string{}, "Override parameters files")
87-
flags.StringArrayVarP(&o.overrides, "set", "s", []string{}, "Override parameters values")
86+
flags.StringArrayVar(&o.parametersFiles, "parameters-file", []string{}, "Override parameters file")
87+
flags.StringArrayVarP(&o.overrides, "set", "s", []string{}, "Override parameter value")
8888
}
8989

9090
type credentialOptions struct {

0 commit comments

Comments
 (0)