Merge pull request #4138 from Microsoft/users/jikuma/DockerAndDockerC…

…omposeLocalization Docker and Docker Compose task localisation and required input fix
microsoft · Apr 26, 2017 · 9d6740d · 9d6740d
2 parents 76272d5 + 4d77e9f
commit 9d6740d
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 18 deletions.
diff --git a/Tasks/Docker/container.ts b/Tasks/Docker/container.ts
@@ -1,12 +1,15 @@
 "use strict";
 
+import path = require('path');
 import * as tl from "vsts-task-lib/task";
 import ContainerConnection from "./containerconnection";
 import AuthenticationTokenProvider  from "docker-common/registryauthenticationprovider/authenticationtokenprovider"
 import ACRAuthenticationTokenProvider from "docker-common/registryauthenticationprovider/acrauthenticationtokenprovider"
 import GenericAuthenticationTokenProvider from "docker-common/registryauthenticationprovider/genericauthenticationtokenprovider"
 import Q = require('q');
 
+tl.setResourcePath(path.join(__dirname, 'task.json'));
+
 // Change to any specified working directory
 tl.cd(tl.getInput("cwd"));
 

diff --git a/Tasks/Docker/containerbuild.ts b/Tasks/Docker/containerbuild.ts
@@ -10,7 +10,7 @@ function findDockerFile(dockerfilepath : string) : string {
 
     if (dockerfilepath.indexOf('*') >= 0 || dockerfilepath.indexOf('?') >= 0) {
         tl.debug(tl.loc('ContainerPatternFound'));
-        var buildFolder = tl.getVariable('System.DefaultWorkingDirectory');
+        var buildFolder = tl.cwd();
         var allFiles = tl.find(buildFolder);
         var matchingResultsFiles = tl.match(allFiles, dockerfilepath, buildFolder, { matchBase: true });
 

diff --git a/Tasks/Docker/task.json b/Tasks/Docker/task.json
@@ -13,7 +13,7 @@
     "version": {
         "Major": 0,
         "Minor": 2,
-        "Patch": 2
+        "Patch": 3
     },
     "demands": [],
     "preview": "true",
@@ -49,16 +49,14 @@
             "type": "connectedService:AzureRM",
             "label": "Azure subscription",
             "helpMarkDown": "Select an Azure subscription",
-            "visibleRule": "containerregistrytype = Azure Container Registry",
-            "required": true
+            "visibleRule": "containerregistrytype = Azure Container Registry"
         },
         {
             "name": "azureContainerRegistry",
             "label": "Azure Container Registry",
             "type": "pickList",
             "helpMarkDown": "Select an Azure Container Registry",
             "visibleRule": "containerregistrytype = Azure Container Registry",
-            "required": true,
             "defaultValue": ""
         },
         {

diff --git a/Tasks/Docker/task.loc.json b/Tasks/Docker/task.loc.json
@@ -13,7 +13,7 @@
   "version": {
     "Major": 0,
     "Minor": 2,
-    "Patch": 2
+    "Patch": 3
   },
   "demands": [],
   "preview": "true",
@@ -49,16 +49,14 @@
       "type": "connectedService:AzureRM",
       "label": "ms-resource:loc.input.label.azureSubscriptionEndpoint",
       "helpMarkDown": "ms-resource:loc.input.help.azureSubscriptionEndpoint",
-      "visibleRule": "containerregistrytype = Azure Container Registry",
-      "required": true
+      "visibleRule": "containerregistrytype = Azure Container Registry"
     },
     {
       "name": "azureContainerRegistry",
       "label": "ms-resource:loc.input.label.azureContainerRegistry",
       "type": "pickList",
       "helpMarkDown": "ms-resource:loc.input.help.azureContainerRegistry",
       "visibleRule": "containerregistrytype = Azure Container Registry",
-      "required": true,
       "defaultValue": ""
     },
     {

diff --git a/Tasks/DockerCompose/dockercompose.ts b/Tasks/DockerCompose/dockercompose.ts
@@ -11,6 +11,8 @@ import GenericAuthenticationTokenProvider from "docker-common/registryauthentica
 
 import Q = require('q');
 
+tl.setResourcePath(path.join(__dirname, 'task.json'));
+
 // Change to any specified working directory
 tl.cd(tl.getInput("cwd"));
 

diff --git a/Tasks/DockerCompose/dockercomposeutils.ts b/Tasks/DockerCompose/dockercomposeutils.ts
@@ -5,7 +5,7 @@ import * as tl from "vsts-task-lib/task";
 export function findDockerFile(dockerfilepath: string): string {
     if (dockerfilepath.indexOf('*') >= 0 || dockerfilepath.indexOf('?') >= 0) {
         tl.debug(tl.loc('ContainerPatternFound'));
-        var buildFolder = tl.getVariable('System.DefaultWorkingDirectory');
+        var buildFolder = tl.cwd();
         var allFiles = tl.find(buildFolder);
         var matchingResultsFiles = tl.match(allFiles, dockerfilepath, buildFolder, { matchBase: true });
 

diff --git a/Tasks/DockerCompose/task.json b/Tasks/DockerCompose/task.json
@@ -13,7 +13,7 @@
     "version": {
         "Major": 0,
         "Minor": 3,
-        "Patch": 6
+        "Patch": 7
     },
     "demands": [],
     "preview": "true",
@@ -49,16 +49,14 @@
             "type": "connectedService:AzureRM",
             "label": "Azure subscription",
             "helpMarkDown": "Select an Azure subscription",
-            "visibleRule": "containerregistrytype = Azure Container Registry",
-            "required": true
+            "visibleRule": "containerregistrytype = Azure Container Registry"
         },
         {
             "name": "azureContainerRegistry",
             "label": "Azure Container Registry",
             "type": "pickList",
             "helpMarkDown": "Select an Azure Container Registry",
             "visibleRule": "containerregistrytype = Azure Container Registry",
-            "required": true,
             "defaultValue": ""
         },
         {

diff --git a/Tasks/DockerCompose/task.loc.json b/Tasks/DockerCompose/task.loc.json
@@ -13,7 +13,7 @@
   "version": {
     "Major": 0,
     "Minor": 3,
-    "Patch": 6
+    "Patch": 7
   },
   "demands": [],
   "preview": "true",
@@ -49,16 +49,14 @@
       "type": "connectedService:AzureRM",
       "label": "ms-resource:loc.input.label.azureSubscriptionEndpoint",
       "helpMarkDown": "ms-resource:loc.input.help.azureSubscriptionEndpoint",
-      "visibleRule": "containerregistrytype = Azure Container Registry",
-      "required": true
+      "visibleRule": "containerregistrytype = Azure Container Registry"
     },
     {
       "name": "azureContainerRegistry",
       "label": "ms-resource:loc.input.label.azureContainerRegistry",
       "type": "pickList",
       "helpMarkDown": "ms-resource:loc.input.help.azureContainerRegistry",
       "visibleRule": "containerregistrytype = Azure Container Registry",
-      "required": true,
       "defaultValue": ""
     },
     {