Merge branch 'feature/setting-secret' into feature/setting-mount-ci

cmd/docker-buildx/config.go

@@ -183,7 +183,7 @@ func settingsFlags(settings *plugin.Settings) []cli.Flag {
 			Usage:       "forwards environment variables as custom arguments to the build",
 			Destination: &settings.Build.ArgsEnv,
 		},
-		&cli.StringFlag{
+		&cli.StringSliceFlag{
 			Name:        "secret",
 			EnvVars:     []string{"PLUGIN_SECRET"},
 			Usage:       "sets custom secret argument for the build",

plugin/docker.go

@@ -94,8 +94,8 @@ func commandBuild(build Build, dryrun bool) *exec.Cmd {
 	for _, arg := range append(defaultBuildArgs, build.Args.Value()...) {
 		args = append(args, "--build-arg", arg)
 	}
-	if build.Secret != "" {
-		args = append(args, "--secret", build.Secret)
+	for _, secret := range build.Secret.Value() {
+		args = append(args, "--secret", secret)
 	}
 	for _, host := range build.AddHost.Value() {
 		args = append(args, "--add-host", host)

plugin/impl.go

@@ -69,7 +69,7 @@ type Build struct {
 	Platforms       cli.StringSlice // Docker build target platforms
 	Args            cli.StringSlice // Docker build args
 	ArgsEnv         cli.StringSlice // Docker build args from env
-	Secret          string          // Docker build secret
+	Secret          cli.StringSlice // Docker build secret
 	Target          string          // Docker build target
 	Output          string          // Docker build output
 	Pull            bool            // Docker build pull