Users/jcfiorenzano/add buildkit support docker v0 v1

Tasks/DockerV0/containerbuild.ts

@@ -77,7 +77,19 @@ export function run(connection: ContainerConnection): any {
         output += data;
     });
 
+    let err: string = "";
+    command.on("stderr", data =>{
+        err += data;
+    });
+
     return connection.execCommand(command).then(() => {
+        if (isBuildKitEnabled())
+        {
+            // Build kit output the build results to stderr instead of stdout
+            // https://github.com/moby/moby/issues/40031
+            output = err;
+        }
+
         let taskOutputPath = utils.writeTaskOutput("build", output);
         tl.setVariable("DockerOutputPath", taskOutputPath);
 
@@ -87,3 +99,9 @@ export function run(connection: ContainerConnection): any {
         }
     });
 }
+
+function isBuildKitEnabled(): boolean {
+    // https://docs.docker.com/develop/develop-images/build_enhancements/
+    const isBuildKitBuildValue = tl.getVariable("DOCKER_BUILDKIT");
+    return isBuildKitBuildValue && Number(isBuildKitBuildValue) == 1;
+}

Tasks/DockerV0/task.json

@@ -13,7 +13,7 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 0,
-        "Minor": 192,
+        "Minor": 194,
         "Patch": 0
     },
     "demands": [],

Tasks/DockerV0/task.loc.json

@@ -13,7 +13,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 0,
-    "Minor": 192,
+    "Minor": 194,
     "Patch": 0
   },
   "demands": [],

Tasks/DockerV1/containerbuild.ts

@@ -80,7 +80,19 @@ export function run(connection: ContainerConnection): any {
         output += data;
     });
 
+    let err: string = "";
+    command.on("stderr", data =>{
+        err += data;
+    });
+
     return connection.execCommand(command).then(() => {
+        if (isBuildKitEnabled())
+        {
+            // Build kit output the build results to stderr instead of stdout
+            // https://github.com/moby/moby/issues/40031
+            output = err;
+        }
+
         let taskOutputPath = utils.writeTaskOutput("build", output);
         tl.setVariable("DockerOutputPath", taskOutputPath);
 
@@ -90,3 +102,9 @@ export function run(connection: ContainerConnection): any {
         }
     });
 }
+
+function isBuildKitEnabled(): boolean {
+    // https://docs.docker.com/develop/develop-images/build_enhancements/
+    const isBuildKitBuildValue = tl.getVariable("DOCKER_BUILDKIT");
+    return isBuildKitBuildValue && Number(isBuildKitBuildValue) == 1;
+}

Tasks/DockerV1/task.json

@@ -13,7 +13,7 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 1,
-        "Minor": 192,
+        "Minor": 194,
         "Patch": 0
     },
     "demands": [],

Tasks/DockerV1/task.loc.json

@@ -13,7 +13,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 1,
-    "Minor": 192,
+    "Minor": 194,
     "Patch": 0
   },
   "demands": [],