docker compose linux issue fixed and default values changed

jikuma · jikuma · commit 43f4cf21de40 · 2017-05-05T17:10:30.000+05:30
diff --git a/Tasks/Docker/Strings/resources.resjson/en-US/resources.resjson b/Tasks/Docker/Strings/resources.resjson/en-US/resources.resjson
@@ -1,7 +1,7 @@
 {
   "loc.friendlyName": "Docker",
-  "loc.helpMarkDown": "[More Information](http://aka.ms/dockertoolsforvsts)",
-  "loc.description": "Build, push or run Docker images, or run a Docker command",
+  "loc.helpMarkDown": "[More Information](https://go.microsoft.com/fwlink/?linkid=848006)",
+  "loc.description": "Build, push or run Docker images, or run a Docker command. Task can be used with Docker or Azure Container registry.",
   "loc.instanceNameFormat": "$(action)",
   "loc.group.displayName.advanced": "Advanced Options",
   "loc.input.label.containerregistrytype": "Container Registry Type",
@@ -23,7 +23,7 @@
   "loc.input.label.context": "Build Context",
   "loc.input.help.context": "Path to the build context.",
   "loc.input.label.imageName": "Image Name",
-  "loc.input.help.imageName": "Name of the Docker image to build, push or run.",
+  "loc.input.help.imageName": "Name of the Docker image to build, push or run. The name will be converted to lowercase as Docker supports only lowercase for image names.",
   "loc.input.label.qualifyImageName": "Qualify Image Name",
   "loc.input.help.qualifyImageName": "Qualify the image name with the Docker registry connection's hostname if not otherwise specified.",
   "loc.input.label.additionalImageTags": "Additional Image Tags",
diff --git a/Tasks/Docker/containerbuild.ts b/Tasks/Docker/containerbuild.ts
@@ -27,6 +27,17 @@ function findDockerFile(dockerfilepath : string) : string {
     }
 }
 
+function changeImageNameToLowerCase(imageName: string): string {
+    var imageNameArray = imageName.split(":");
+
+    if(imageNameArray.length > 0)
+    {
+        imageName = imageNameArray[0].toLowerCase() + ":" +  imageNameArray.slice(1).join(":");
+    }
+
+    return imageName;
+} 
+
 export function run(connection: ContainerConnection): any {
     var command = connection.createCommand();
     command.arg("build");
@@ -45,6 +56,7 @@ export function run(connection: ContainerConnection): any {
     });
 
     var imageName = tl.getInput("imageName", true);
+    imageName = changeImageNameToLowerCase(imageName);
     var qualifyImageName = tl.getBoolInput("qualifyImageName");
     if (qualifyImageName) {
         imageName = connection.qualifyImageName(imageName);
diff --git a/Tasks/Docker/task.json b/Tasks/Docker/task.json
@@ -2,7 +2,7 @@
     "id": "E28912F1-0114-4464-802A-A3A35437FD16",
     "name": "Docker",
     "friendlyName": "Docker",
-    "description": "Build, push or run Docker images, or run a Docker command",
+    "description": "Build, push or run Docker images, or run a Docker command. Task can be used with Docker or Azure Container registry.",
     "helpMarkDown": "[More Information](https://go.microsoft.com/fwlink/?linkid=848006)",
     "category": "Build",
     "visibility": [
@@ -13,7 +13,7 @@
     "version": {
         "Major": 0,
         "Minor": 2,
-        "Patch": 3
+        "Patch": 4
     },
     "demands": [],
     "preview": "true",
@@ -97,7 +97,7 @@
             "name": "defaultContext",
             "type": "boolean",
             "label": "Use Default Build Context",
-            "defaultValue": "false",
+            "defaultValue": "true",
             "visibleRule": "action = Build an image",
             "helpMarkDown": "Set the build context to the directory that contains the Docker file."
         },
@@ -115,13 +115,13 @@
             "defaultValue": "$(Build.Repository.Name):$(Build.BuildId)",
             "required": true,
             "visibleRule": "action = Build an image || action = Push an image || action = Run an image",
-            "helpMarkDown": "Name of the Docker image to build, push or run."
+            "helpMarkDown": "Name of the Docker image to build, push or run. The name will be converted to lowercase as Docker supports only lowercase for image names."
         },
         {
             "name": "qualifyImageName",
             "type": "boolean",
             "label": "Qualify Image Name",
-            "defaultValue": "false",
+            "defaultValue": "true",
             "visibleRule": "action = Build an image || action = Push an image || action = Run an image",
             "helpMarkDown": "Qualify the image name with the Docker registry connection's hostname if not otherwise specified."
         },
diff --git a/Tasks/Docker/task.loc.json b/Tasks/Docker/task.loc.json
@@ -13,7 +13,7 @@
   "version": {
     "Major": 0,
     "Minor": 2,
-    "Patch": 3
+    "Patch": 4
   },
   "demands": [],
   "preview": "true",
@@ -97,7 +97,7 @@
       "name": "defaultContext",
       "type": "boolean",
       "label": "ms-resource:loc.input.label.defaultContext",
-      "defaultValue": "false",
+      "defaultValue": "true",
       "visibleRule": "action = Build an image",
       "helpMarkDown": "ms-resource:loc.input.help.defaultContext"
     },
@@ -121,7 +121,7 @@
       "name": "qualifyImageName",
       "type": "boolean",
       "label": "ms-resource:loc.input.label.qualifyImageName",
-      "defaultValue": "false",
+      "defaultValue": "true",
       "visibleRule": "action = Build an image || action = Push an image || action = Run an image",
       "helpMarkDown": "ms-resource:loc.input.help.qualifyImageName"
     },
diff --git a/Tasks/DockerCompose/Strings/resources.resjson/en-US/resources.resjson b/Tasks/DockerCompose/Strings/resources.resjson/en-US/resources.resjson
@@ -1,7 +1,7 @@
 {
   "loc.friendlyName": "Docker Compose",
-  "loc.helpMarkDown": "[More Information](http://aka.ms/dockertoolsforvsts)",
-  "loc.description": "Build, push or run multi-container Docker applications",
+  "loc.helpMarkDown": "[More Information](https://go.microsoft.com/fwlink/?linkid=848006)",
+  "loc.description": "Build, push or run multi-container Docker applications. Task can be used with Docker or Azure Container registry.",
   "loc.instanceNameFormat": "$(action)",
   "loc.group.displayName.advanced": "Advanced Options",
   "loc.input.label.containerregistrytype": "Container Registry Type",
diff --git a/Tasks/DockerCompose/dockercompose.ts b/Tasks/DockerCompose/dockercompose.ts
@@ -44,14 +44,14 @@ if (nopIfNoDockerComposeFile && !tl.exist(dockerFile)) {
             var action = tl.getInput("action", true);
             /* tslint:disable:no-var-requires */
             return require({
-                "Build services": "./dockerComposeBuild",
-                "Push services": "./dockerComposePush",
-                "Run services": "./dockerComposeUp",
-                "Run a specific service": "./dockerComposeRun",
-                "Lock services": "./dockerComposeLock",
-                "Write service image digests": "./dockerComposeDigests",
-                "Combine configuration": "./dockerComposeConfig",
-                "Run a Docker Compose command": "./dockerComposeCommand"
+                "Build services": "./dockercomposebuild",
+                "Push services": "./dockercomposepush",
+                "Run services": "./dockercomposeup",
+                "Run a specific service": "./dockercomposerun",
+                "Lock services": "./dockercomposelock",
+                "Write service image digests": "./dockercomposedigests",
+                "Combine configuration": "./dockercomposeconfig",
+                "Run a Docker Compose command": "./dockercomposecommand"
             }[action]).run(connection);
             /* tslint:enable:no-var-requires */
         })
diff --git a/Tasks/DockerCompose/task.json b/Tasks/DockerCompose/task.json
@@ -2,7 +2,7 @@
     "id": "6975E2D1-96D3-4AFC-8A41-498B5D34EA19",
     "name": "DockerCompose",
     "friendlyName": "Docker Compose",
-    "description": "Build, push or run multi-container Docker applications",
+    "description": "Build, push or run multi-container Docker applications. Task can be used with Docker or Azure Container registry.",
     "helpMarkDown": "[More Information](https://go.microsoft.com/fwlink/?linkid=848006)",
     "category": "Build",
     "visibility": [
@@ -12,8 +12,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 0,
-        "Minor": 3,
-        "Patch": 7
+        "Minor": 4,
+        "Patch": 0
     },
     "demands": [],
     "preview": "true",
@@ -98,7 +98,7 @@
             "name": "qualifyImageNames",
             "type": "boolean",
             "label": "Qualify Image Names",
-            "defaultValue": "false",
+            "defaultValue": "true",
             "helpMarkDown": "Qualify image names for built services with the Docker registry connection's hostname if not otherwise specified."
         },
         {
diff --git a/Tasks/DockerCompose/task.loc.json b/Tasks/DockerCompose/task.loc.json
@@ -12,8 +12,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 0,
-    "Minor": 3,
-    "Patch": 7
+    "Minor": 4,
+    "Patch": 0
   },
   "demands": [],
   "preview": "true",
@@ -98,7 +98,7 @@
       "name": "qualifyImageNames",
       "type": "boolean",
       "label": "ms-resource:loc.input.label.qualifyImageNames",
-      "defaultValue": "false",
+      "defaultValue": "true",
       "helpMarkDown": "ms-resource:loc.input.help.qualifyImageNames"
     },
     {
