Add ability to inline Dockerfile via dockerfileContent option.

CHANGELOG.md

@@ -1,4 +1,8 @@
 ## HEAD (Unreleased)
+* Add `dockerfileContent` parameter to `docker.Image` in the Node SDK.
+* Add `DockerfileContent` parameter to `docker.Image` in the DotNet SDK.
+* Add `DockerfileContent` parameter to `docker.Image` in the Python SDK.
+* Add `dockerfile_content` parameter to `docker.Image` in the Golang SDK.
 * Fix handling of the `cache_from` parameter in `docker.Image` in the Python SDK.
 * Fix handling of the `cache_from` parameter in `docker.Image` in the Golang SDK.
 

sdk/dotnet/Docker.cs

@@ -75,6 +75,13 @@ public class DockerBuild : ResourceArgs
         /// </summary>
         [Input("target")]
         public Input<string>? Target { get; set; }
+
+        /// <summary>
+        /// is the content of the dockerfile to build
+        /// example `FROM node`.
+        /// </summary>
+        [Input("dockerfileContent")]
+        public Input<string>? DockerfileContent { get; set; }
     }
 
     /// <summary>
@@ -423,16 +430,27 @@ private static async Task RunDockerBuild(
             {
                 buildArgs.AddRange(build.ExtraOptions);
             }
-            buildArgs.Add(build.Context!); // push the docker build context onto the path.
+
+            if (build.DockerfileContent == null)
+            {
+                buildArgs.Add(build.Context!);
+            }
+
+             // push the docker build context onto the path.
 
             buildArgs.AddRange(new[] { "-t", imageName }); // tag the image with the chosen name.
             if (target != null)
             {
                 buildArgs.AddRange(new[] { "--target", target });
             }
 
+            if (build.DockerfileContent != null)
+            {
+              buildArgs.Add("-");
+            }
+
             await RunCommandThatMustSucceed("docker", buildArgs.ToArray(), logResource,
-                reportFullCommandLine: true, stdin: null, build.Env).ConfigureAwait(false);
+                reportFullCommandLine: true, stdin: build.DockerfileContent, build.Env).ConfigureAwait(false);
         }
 
         private static readonly ConcurrentDictionary<(string, string), Task> loginResults = new ConcurrentDictionary<(string, string), Task>();

sdk/go/docker/customTypes.go

@@ -173,6 +173,9 @@ type DockerBuildArgs struct {
 
 	// The target of the dockerfile to build.
 	Target pulumi.StringInput `pulumi:"target"`
+
+	// The content of the dockerfile to build.
+	DockerfileContent pulumi.StringInput `pulumi:"dockerfileContent"`
 }
 
 // nolint:golint

sdk/go/docker/docker.go

@@ -391,14 +391,21 @@ func runDockerBuild(ctx *pulumi.Context, imageName string, build *DockerBuild, c
 	if build.ExtraOptions != nil {
 		buildArgs = append(buildArgs, build.ExtraOptions...)
 	}
-	// Push the docker build context onto the path.
-	buildArgs = append(buildArgs, build.Context)
+	if build.DockerfileContent == nil {
+		// Push the docker build context onto the path.
+		buildArgs = append(buildArgs, build.Context)
+	}
 
 	buildArgs = append(buildArgs, "-t", imageName)
 	if target != "" {
 		buildArgs = append(buildArgs, "--target", target)
 	}
 
+	if build.DockerfileContent != nil {
+		// Push the docker build context onto the path.
+		buildArgs = append(buildArgs, "-")
+	}
+
 	_, err := runCommandThatMustSucceed(ctx, "docker", buildArgs, logResource, true, "", build.Env)
 	return err
 }

sdk/nodejs/docker.ts

@@ -90,6 +90,11 @@ export interface DockerBuild {
      * The target of the dockerfile to build
      */
     target?: pulumi.Input<string>;
+
+    /***
+     * The content of the dockerfile to build
+     */
+    dockerfileContent?: pulumi.Input<string>;
 }
 
 let dockerPasswordPromise: Promise<boolean> | undefined;
@@ -465,15 +470,21 @@ async function dockerBuild(
     if (build.extraOptions) {
         buildArgs.push(...build.extraOptions);
     }
-    buildArgs.push(build.context!); // push the docker build context onto the path.
+    if(!build.dockerfileContent){
+        buildArgs.push(build.context!);
+    }
 
     buildArgs.push(...["-t", imageName]); // tag the image with the chosen name.
+
     if (target) {
         buildArgs.push(...["--target", target]);
     }
 
-    await runCommandThatMustSucceed("docker", buildArgs, logResource, undefined, undefined, build.env);
+    if(build.dockerfileContent){
+        buildArgs.push('-');
+    }
 
+    await runCommandThatMustSucceed("docker", buildArgs, logResource, undefined, build.dockerfileContent, build.env);
 }
 
 interface LoginResult {
@@ -728,4 +739,4 @@ async function runCommandThatCanFail(
             resolve({ code, stdout });
         }
     });
-}
+}

sdk/python/pulumi_docker/docker.py

@@ -117,8 +117,13 @@ class DockerBuild:
     The target of the dockerfile to build
     """
 
+    dockerfile_content: Optional[pulumi.Input[str]]
+    """
+    The content of the dockerfile to build
+    """
+
     def __init__(self, context=None, dockerfile=None, args=None, cache_from=None, extra_options=None, env=None,
-                 target=None):
+                 target=None, dockerfile_content=None):
         """
         DockerBuild may be used to specify detailed instructions about how to build a container.
 
@@ -143,6 +148,7 @@ def __init__(self, context=None, dockerfile=None, args=None, cache_from=None, ex
         :param Optional[Mapping[str, str]] env: Environment variables to set on the invocation of `docker build`, for
          example to support `DOCKER_BUILDKIT=1 docker build`.
         :param Optional[pulumi.Input[str]] target: The target of the dockerfile to build
+        :param Optional[pulumi.Input[str]] dockerfile_content is the content of the dockerfile to build
         """
         self.context = context
         self.dockerfile = dockerfile
@@ -485,10 +491,14 @@ def docker_build(
     if target:
         build_args.extend(["--target", target])
 
-    if build.context:
-        build_args.append(build.context)  # push the docker build context onto the path.
+    if not build.dockerfile_content:
+      if build.context:
+          build_args.append(build.context) # push the docker build context onto the path.
+
+    if build.dockerfile_content:
+        build_args.extend(['-'])
 
-    return run_command_that_must_succeed("docker", build_args, log_resource, env=build.env)
+    return run_command_that_must_succeed("docker", build_args, log_resource, stdin=build.dockerfile_content, env=build.env)
 
 
 class LoginResult: