add "docker-build-options" for passing options to "docker build"

Author: geropl

cmd/build.go

@@ -171,6 +171,7 @@ func addBuildFlags(cmd *cobra.Command) {
 	cmd.Flags().Bool("dont-retag", false, "Disable Docker image re-tagging (defaults to false)")
 	cmd.Flags().UintP("max-concurrent-tasks", "j", uint(runtime.NumCPU()), "Limit the number of max concurrent build tasks - set to 0 to disable the limit")
 	cmd.Flags().String("coverage-output-path", "", "Output path where test coverage file will be copied after running tests")
+	cmd.Flags().StringToString("docker-build-options", nil, "Options passed to all 'docker build' commands")
 }
 
 func getBuildOpts(cmd *cobra.Command) ([]leeway.BuildOption, *leeway.FilesystemCache) {
@@ -275,6 +276,12 @@ func getBuildOpts(cmd *cobra.Command) ([]leeway.BuildOption, *leeway.FilesystemC
 		_ = os.MkdirAll(coverageOutputPath, 0644)
 	}
 
+	var dockerBuildOptions leeway.DockerBuildOptions
+	dockerBuildOptions, err = cmd.Flags().GetStringToString("docker-build-options")
+	if err != nil {
+		log.Fatal(err)
+	}
+
 	return []leeway.BuildOption{
 		leeway.WithLocalCache(localCache),
 		leeway.WithRemoteCache(remoteCache),
@@ -286,6 +293,7 @@ func getBuildOpts(cmd *cobra.Command) ([]leeway.BuildOption, *leeway.FilesystemC
 		leeway.WithMaxConcurrentTasks(int64(maxConcurrentTasks)),
 		leeway.WithCoverageOutputPath(coverageOutputPath),
 		leeway.WithDontRetag(dontRetag),
+		leeway.WithDockerBuildOptions(&dockerBuildOptions),
 	}, localCache
 }
 

pkg/leeway/build.go

@@ -213,10 +213,14 @@ type buildOptions struct {
 	MaxConcurrentTasks     int64
 	CoverageOutputPath     string
 	DontRetag              bool
+	DockerBuildOptions     *DockerBuildOptions
 
 	context *buildContext
 }
 
+// DockerBuildOptions are options passed to "docker build"
+type DockerBuildOptions map[string]string
+
 // BuildOption configures the build behaviour
 type BuildOption func(*buildOptions) error
 
@@ -304,6 +308,14 @@ func WithDontRetag(dontRetag bool) BuildOption {
 	}
 }
 
+// WithDockerBuildOptions are passed to "docker build"
+func WithDockerBuildOptions(dockerBuildOpts *DockerBuildOptions) BuildOption {
+	return func(opts *buildOptions) error {
+		opts.DockerBuildOptions = dockerBuildOpts
+		return nil
+	}
+}
+
 func withBuildContext(ctx *buildContext) BuildOption {
 	return func(opts *buildOptions) error {
 		opts.context = ctx
@@ -1019,6 +1031,11 @@ func (p *Package) buildDocker(buildctx *buildContext, wd, result string) (err er
 	if cfg.Squash {
 		buildcmd = append(buildcmd, "--squash")
 	}
+	if buildctx.DockerBuildOptions != nil {
+		for opt, v := range *buildctx.DockerBuildOptions {
+			buildcmd = append(buildcmd, fmt.Sprintf("--%s=%s", opt, v))
+		}
+	}
 	buildcmd = append(buildcmd, ".")
 	commands = append(commands, buildcmd)