Merge pull request #12439 from oatmealraisin/rymurphy/docker-args

Merged by openshift-bot

api/swagger-spec/oapi-v1.json

@@ -23558,6 +23558,13 @@
      "dockerfilePath": {
       "type": "string",
       "description": "dockerfilePath is the path of the Dockerfile that will be used to build the Docker image, relative to the root of the context (contextDir)."
+     },
+     "buildArgs": {
+      "type": "array",
+      "items": {
+       "$ref": "v1.EnvVar"
+      },
+      "description": "Args contains any build arguments that are to be passed to Docker.  See https://docs.docker.com/engine/reference/builder/#/arg for more details"
      }
     }
    },
@@ -24096,6 +24103,10 @@
        "$ref": "v1.BuildTriggerCause"
       },
       "description": "triggeredBy describes which triggers started the most recent update to the build configuration and contains information about those triggers."
+     },
+     "dockerStrategyOptions": {
+      "$ref": "v1.DockerStrategyOptions",
+      "description": "DockerStrategyOptions contains additional docker-strategy specific options for the build"
      }
     }
    },
@@ -24163,6 +24174,19 @@
      }
     }
    },
+   "v1.DockerStrategyOptions": {
+    "id": "v1.DockerStrategyOptions",
+    "description": "DockerStrategyOptions contains extra strategy options for Docker builds",
+    "properties": {
+     "buildArgs": {
+      "type": "array",
+      "items": {
+       "$ref": "v1.EnvVar"
+      },
+      "description": "Args contains any build arguments that are to be passed to Docker.  See https://docs.docker.com/engine/reference/builder/#/arg for more details"
+     }
+    }
+   },
    "v1.BuildList": {
     "id": "v1.BuildList",
     "description": "BuildList is a collection of Builds.",

api/swagger-spec/openshift-openapi-spec.json

@@ -48418,6 +48418,10 @@
       "description": "binary indicates a request to build from a binary provided to the builder",
       "$ref": "#/definitions/v1.BinaryBuildSource"
      },
+     "dockerStrategyOptions": {
+      "description": "DockerStrategyOptions contains additional docker-strategy specific options for the build",
+      "$ref": "#/definitions/v1.DockerStrategyOptions"
+     },
      "env": {
       "description": "env contains additional environment variables you want to pass into a builder container. ValueFrom is not supported.",
       "type": "array",
@@ -50283,6 +50287,13 @@
    "v1.DockerBuildStrategy": {
     "description": "DockerBuildStrategy defines input parameters specific to Docker build.",
     "properties": {
+     "buildArgs": {
+      "description": "Args contains any build arguments that are to be passed to Docker.  See https://docs.docker.com/engine/reference/builder/#/arg for more details",
+      "type": "array",
+      "items": {
+       "$ref": "#/definitions/v1.EnvVar"
+      }
+     },
      "dockerfilePath": {
       "description": "dockerfilePath is the path of the Dockerfile that will be used to build the Docker image, relative to the root of the context (contextDir).",
       "type": "string"
@@ -50312,6 +50323,18 @@
      }
     }
    },
+   "v1.DockerStrategyOptions": {
+    "description": "DockerStrategyOptions contains extra strategy options for Docker builds",
+    "properties": {
+     "buildArgs": {
+      "description": "Args contains any build arguments that are to be passed to Docker.  See https://docs.docker.com/engine/reference/builder/#/arg for more details",
+      "type": "array",
+      "items": {
+       "$ref": "#/definitions/v1.EnvVar"
+      }
+     }
+    }
+   },
    "v1.DownwardAPIVolumeFile": {
     "description": "DownwardAPIVolumeFile represents information to create the file containing the pod field",
     "required": [

contrib/completions/bash/oc

@@ -11513,6 +11513,8 @@ _oc_new-build()
     local_nonpersistent_flags+=("--allow-missing-imagestream-tags")
     flags+=("--binary")
     local_nonpersistent_flags+=("--binary")
+    flags+=("--build-arg=")
+    local_nonpersistent_flags+=("--build-arg=")
     flags+=("--build-secret=")
     local_nonpersistent_flags+=("--build-secret=")
     flags+=("--code=")
@@ -15735,6 +15737,8 @@ _oc_start-build()
     flags_with_completion=()
     flags_completion=()
 
+    flags+=("--build-arg=")
+    local_nonpersistent_flags+=("--build-arg=")
     flags+=("--build-loglevel=")
     local_nonpersistent_flags+=("--build-loglevel=")
     flags+=("--commit=")

contrib/completions/bash/openshift

@@ -16761,6 +16761,8 @@ _openshift_cli_new-build()
     local_nonpersistent_flags+=("--allow-missing-imagestream-tags")
     flags+=("--binary")
     local_nonpersistent_flags+=("--binary")
+    flags+=("--build-arg=")
+    local_nonpersistent_flags+=("--build-arg=")
     flags+=("--build-secret=")
     local_nonpersistent_flags+=("--build-secret=")
     flags+=("--code=")
@@ -21101,6 +21103,8 @@ _openshift_cli_start-build()
     flags_with_completion=()
     flags_completion=()
 
+    flags+=("--build-arg=")
+    local_nonpersistent_flags+=("--build-arg=")
     flags+=("--build-loglevel=")
     local_nonpersistent_flags+=("--build-loglevel=")
     flags+=("--commit=")

contrib/completions/zsh/oc

@@ -11661,6 +11661,8 @@ _oc_new-build()
     local_nonpersistent_flags+=("--allow-missing-imagestream-tags")
     flags+=("--binary")
     local_nonpersistent_flags+=("--binary")
+    flags+=("--build-arg=")
+    local_nonpersistent_flags+=("--build-arg=")
     flags+=("--build-secret=")
     local_nonpersistent_flags+=("--build-secret=")
     flags+=("--code=")
@@ -15883,6 +15885,8 @@ _oc_start-build()
     flags_with_completion=()
     flags_completion=()
 
+    flags+=("--build-arg=")
+    local_nonpersistent_flags+=("--build-arg=")
     flags+=("--build-loglevel=")
     local_nonpersistent_flags+=("--build-loglevel=")
     flags+=("--commit=")

contrib/completions/zsh/openshift

@@ -16909,6 +16909,8 @@ _openshift_cli_new-build()
     local_nonpersistent_flags+=("--allow-missing-imagestream-tags")
     flags+=("--binary")
     local_nonpersistent_flags+=("--binary")
+    flags+=("--build-arg=")
+    local_nonpersistent_flags+=("--build-arg=")
     flags+=("--build-secret=")
     local_nonpersistent_flags+=("--build-secret=")
     flags+=("--code=")
@@ -21249,6 +21251,8 @@ _openshift_cli_start-build()
     flags_with_completion=()
     flags_completion=()
 
+    flags+=("--build-arg=")
+    local_nonpersistent_flags+=("--build-arg=")
     flags+=("--build-loglevel=")
     local_nonpersistent_flags+=("--build-loglevel=")
     flags+=("--commit=")

pkg/build/api/types.go

@@ -590,6 +590,10 @@ type DockerBuildStrategy struct {
 	// ValueFrom is not supported.
 	Env []kapi.EnvVar
 
+	// Args contains any build arguments that are to be passed to Docker.  See
+	// https://docs.docker.com/engine/reference/builder/#/arg for more details
+	BuildArgs []kapi.EnvVar
+
 	// ForcePull describes if the builder should pull the images from registry prior to building.
 	ForcePull bool
 
@@ -919,6 +923,9 @@ type GenericWebHookEvent struct {
 	// Env contains additional environment variables you want to pass into a builder container.
 	// ValueFrom is not supported.
 	Env []kapi.EnvVar
+
+	// DockerStrategyOptions contains additional docker-strategy specific options for the build
+	DockerStrategyOptions *DockerStrategyOptions
 }
 
 // GitInfo is the aggregated git information for a generic webhook post
@@ -944,6 +951,13 @@ type BuildLog struct {
 	unversioned.TypeMeta
 }
 
+// DockerStrategyOptions contains extra strategy options for Docker builds
+type DockerStrategyOptions struct {
+	// Args contains any build arguments that are to be passed to Docker.  See
+	// https://docs.docker.com/engine/reference/builder/#/arg for more details
+	BuildArgs []kapi.EnvVar
+}
+
 // BuildRequest is the resource used to pass parameters to build generator
 type BuildRequest struct {
 	unversioned.TypeMeta
@@ -975,6 +989,9 @@ type BuildRequest struct {
 	// TriggeredBy describes which triggers started the most recent update to the
 	// buildconfig and contains information about those triggers.
 	TriggeredBy []BuildTriggerCause
+
+	// DockerStrategyOptions contains additional docker-strategy specific options for the build
+	DockerStrategyOptions *DockerStrategyOptions
 }
 
 type BinaryBuildRequestOptions struct {