Merge pull request #18 from MaterializeInc/build-arg-support

Add Docker build args support

Author: benesch

cmd/pulumi-resource-docker-buildkit/main.go

@@ -264,16 +264,25 @@ func (k *dockerBuildkitProvider) dockerBuild(
 	for _, v := range inputs["platforms"].ArrayValue() {
 		platforms = append(platforms, v.StringValue())
 	}
-	cmd := exec.Command(
-		"docker", "buildx", "build",
+
+	args := []string{
+		"buildx", "build",
 		"--platform", strings.Join(platforms, ","),
 		"--cache-from", name,
 		"--cache-to", "type=inline",
 		"-f", filepath.Join(context, dockerfile),
 		"--target", target,
 		"-t", name, "--push",
-		context,
-	)
+	}
+	if !inputs["args"].IsNull() {
+		for _, v := range inputs["args"].ArrayValue() {
+			name := v.ObjectValue()["name"].StringValue()
+			value := v.ObjectValue()["value"].StringValue()
+			args = append(args, "--build-arg", fmt.Sprintf("%s=%s", name, value))
+		}
+	}
+	args = append(args, context)
+	cmd := exec.Command("docker", args...)
 	if err := runCommand(ctx, k.host, urn, cmd); err != nil {
 		return nil, fmt.Errorf("docker build failed: %w", err)
 	}

cmd/pulumi-sdkgen-docker-buildkit/main.go

@@ -128,6 +128,15 @@ func run(version string) error {
 						TypeSpec:    schema.TypeSpec{Type: "string"},
 						Default:     "",
 					},
+					"args": {
+						Description: "The build arguments.",
+						TypeSpec: schema.TypeSpec{
+							Type: "array",
+							Items: &schema.TypeSpec{
+								Ref: "#/types/docker-buildkit:index:BuildArg",
+							},
+						},
+					},
 				},
 				RequiredInputs: []string{"name", "registry"},
 			},
@@ -154,6 +163,23 @@ func run(version string) error {
 					Required: []string{"server"},
 				},
 			},
+			"docker-buildkit:index:BuildArg": {
+				ObjectTypeSpec: schema.ObjectTypeSpec{
+					Description: "Describes a Docker build argument.",
+					Type:        "object",
+					Properties: map[string]schema.PropertySpec{
+						"name": {
+							Description: "The name of the Docker build argument.",
+							TypeSpec:    schema.TypeSpec{Type: "string"},
+						},
+						"value": {
+							Description: "The value of the Docker build argument.",
+							TypeSpec:    schema.TypeSpec{Type: "string"},
+						},
+					},
+					Required: []string{"name", "value"},
+				},
+			},
 		},
 		Language: map[string]schema.RawMessage{
 			"python": schema.RawMessage("{}"),

examples/aws-nodejs/Dockerfile

@@ -1,3 +1,5 @@
 FROM ubuntu
 
-RUN apt-get update && apt-get install -qy python-is-python3 python3
+ARG command=false
+
+RUN $command

examples/aws-nodejs/index.ts

@@ -12,5 +12,9 @@ const registryInfo = repo.registryId.apply(async id => {
 
 export const image = new dockerBuildkit.Image(
     "image",
-    { name: repo.repositoryUrl, registry: registryInfo },
+    {
+        name: repo.repositoryUrl,
+        registry: registryInfo,
+        args: [{name: "command", value: "true"}],
+    },
 ).repoDigest;

examples/aws-python/Dockerfile

@@ -1,3 +1,5 @@
 FROM ubuntu
 
-RUN apt-get update && apt-get install -qy python-is-python3 python3
+ARG command=false
+
+RUN $command

examples/aws-python/__main__.py

@@ -19,6 +19,7 @@ def get_registry_info(registry_id):
     "image",
     name=repo.repository_url,
     registry=repo.registry_id.apply(get_registry_info),
+    args=[docker_buildkit.BuildArgArgs(name="command", value="true")]
 )
 pulumi.export("image", image.repo_digest)