Change Docker cli default versions in DockerComposeV0 (#20125)

* Change Docker cli default versions in DockerComposeV0

* Set docker-compose as default cli in unit tests

Author: ivanduplenskikh

Tasks/DockerComposeV0/Tests/L0.ts

@@ -8,7 +8,7 @@ describe('Docker Compose Suite', function() {
     let composeCommand: string;
 
     before(() => {
-        composeCommand = "docker compose";
+        composeCommand = "docker-compose";
     });
 
     beforeEach(() => {

Tasks/DockerComposeV0/Tests/L0Windows.ts

@@ -48,27 +48,27 @@ let a: any = <any>{
         "docker-compose": true
     },
     "exec": {
-        "docker-compose -f F:\\dir2\\docker-compose.yml build" : {
+        "docker-compose -f F:\\dir2\\docker-compose.yml build": {
             "code": 0,
             "stdout": "sucessfully built the service images"
         },
-        "docker compose -f F:\\dir2\\docker-compose.yml build" : {
+        "docker compose -f F:\\dir2\\docker-compose.yml build": {
             "code": 0,
             "stdout": "sucessfully built the service images"
         },
-        "docker-compose-userdefined -f F:\\dir2\\docker-compose.yml build" : {
+        "docker-compose-userdefined -f F:\\dir2\\docker-compose.yml build": {
             "code": 0,
             "stdout": "sucessfully built the service images"
         },
-        "docker-compose -f F:\\dir2\\docker-compose.yml config" : {
+        "docker-compose -f F:\\dir2\\docker-compose.yml config": {
             "code": 0,
             "stdout": "services:\n  redis:\n    image: redis:alpine\n  web:\n    build:\n      context: C:\\docketest\n    ports:\n    - 5000:5000/tcp\n    volumes:\n    - C:\\docketest:/code:rw\nversion: '2.0'"
         },
-        "docker compose -f F:\\dir2\\docker-compose.yml config" : {
+        "docker compose -f F:\\dir2\\docker-compose.yml config": {
             "code": 0,
             "stdout": "services:\n  redis:\n    image: redis:alpine\n  web:\n    build:\n      context: C:\\docketest\n    ports:\n    - 5000:5000/tcp\n    volumes:\n    - C:\\docketest:/code:rw\nversion: '2.0'"
         },
-        "docker-compose-userdefined -f F:\\dir2\\docker-compose.yml config" : {
+        "docker-compose-userdefined -f F:\\dir2\\docker-compose.yml config": {
             "code": 0,
             "stdout": "services:\n  redis:\n    image: redis:alpine\n  web:\n    build:\n      context: C:\\docketest\n    ports:\n    - 5000:5000/tcp\n    volumes:\n    - C:\\docketest:/code:rw\nversion: '2.0'"
         },
@@ -84,11 +84,11 @@ let a: any = <any>{
             "code": 0,
             "stdout": "sucessfully ran services"
         },
-        "docker-compose -f F:\\dir2\\docker-compose.yml build --pull --parallel" : {
+        "docker-compose -f F:\\dir2\\docker-compose.yml build --pull --parallel": {
             "code": 0,
             "stdout": "sucessfully built the service images"
         },
-        "docker compose -f F:\\dir2\\docker-compose.yml build --pull --parallel" : {
+        "docker compose -f F:\\dir2\\docker-compose.yml build --pull --parallel": {
             "code": 0,
             "stdout": "sucessfully built the service images"
         },
@@ -128,11 +128,11 @@ let a: any = <any>{
             "code": 0,
             "stdout": "successfully ran up command"
         },
-        "docker-compose -f F:\\dir2\\docker-compose.yml pull service1 service2" : {
+        "docker-compose -f F:\\dir2\\docker-compose.yml pull service1 service2": {
             "code": 0,
             "stdout": "successfully pulled the passed service images"
         },
-        "docker compose -f F:\\dir2\\docker-compose.yml pull service1 service2" : {
+        "docker compose -f F:\\dir2\\docker-compose.yml pull service1 service2": {
             "code": 0,
             "stdout": "successfully pulled the passed service images"
         }

Tasks/DockerComposeV0/dockercomposeconnection.ts

@@ -93,7 +93,7 @@ export default class DockerComposeConnection extends ContainerConnection {
     public createComposeCommand(): tr.ToolRunner {
         var command = tl.tool(this.dockerComposePath);
 
-        if (!tl.getInput('dockerComposePath')) {
+        if (!tl.getInput('dockerComposePath') && !this.dockerComposePath.includes("docker-compose")) {
             command.arg("compose");
             process.env["COMPOSE_COMPATIBILITY"] = "true";
         }
@@ -184,10 +184,10 @@ export default class DockerComposeConnection extends ContainerConnection {
         //Priority to docker-compose path provided by user
         this.dockerComposePath = tl.getInput('dockerComposePath');
         if (!this.dockerComposePath) {
-            this.dockerComposePath = tl.which("docker");
+            this.dockerComposePath = tl.which("docker-compose");
 
             if (!this.dockerComposePath) {
-                this.dockerComposePath = tl.which("docker-compose");
+                this.dockerComposePath = tl.which("docker");
             }
 
             if (!this.dockerComposePath) {

Tasks/DockerComposeV0/task.json

@@ -14,7 +14,7 @@
   "version": {
     "Major": 0,
     "Minor": 242,
-    "Patch": 8
+    "Patch": 10
   },
   "demands": [],
   "preview": "false",

Tasks/DockerComposeV0/task.loc.json

@@ -14,7 +14,7 @@
   "version": {
     "Major": 0,
     "Minor": 242,
-    "Patch": 8
+    "Patch": 10
   },
   "demands": [],
   "preview": "false",

_generated/DockerComposeV0.versionmap.txt

@@ -1,2 +1,2 @@
-Default|0.242.8
-Node20_229_2|0.242.9
+Default|0.242.10
+Node20_229_2|0.242.11

_generated/DockerComposeV0/Tests/L0.ts

@@ -8,7 +8,7 @@ describe('Docker Compose Suite', function() {
     let composeCommand: string;
 
     before(() => {
-        composeCommand = "docker compose";
+        composeCommand = "docker-compose";
     });
 
     beforeEach(() => {

_generated/DockerComposeV0/Tests/L0Windows.ts

@@ -48,27 +48,27 @@ let a: any = <any>{
         "docker-compose": true
     },
     "exec": {
-        "docker-compose -f F:\\dir2\\docker-compose.yml build" : {
+        "docker-compose -f F:\\dir2\\docker-compose.yml build": {
             "code": 0,
             "stdout": "sucessfully built the service images"
         },
-        "docker compose -f F:\\dir2\\docker-compose.yml build" : {
+        "docker compose -f F:\\dir2\\docker-compose.yml build": {
             "code": 0,
             "stdout": "sucessfully built the service images"
         },
-        "docker-compose-userdefined -f F:\\dir2\\docker-compose.yml build" : {
+        "docker-compose-userdefined -f F:\\dir2\\docker-compose.yml build": {
             "code": 0,
             "stdout": "sucessfully built the service images"
         },
-        "docker-compose -f F:\\dir2\\docker-compose.yml config" : {
+        "docker-compose -f F:\\dir2\\docker-compose.yml config": {
             "code": 0,
             "stdout": "services:\n  redis:\n    image: redis:alpine\n  web:\n    build:\n      context: C:\\docketest\n    ports:\n    - 5000:5000/tcp\n    volumes:\n    - C:\\docketest:/code:rw\nversion: '2.0'"
         },
-        "docker compose -f F:\\dir2\\docker-compose.yml config" : {
+        "docker compose -f F:\\dir2\\docker-compose.yml config": {
             "code": 0,
             "stdout": "services:\n  redis:\n    image: redis:alpine\n  web:\n    build:\n      context: C:\\docketest\n    ports:\n    - 5000:5000/tcp\n    volumes:\n    - C:\\docketest:/code:rw\nversion: '2.0'"
         },
-        "docker-compose-userdefined -f F:\\dir2\\docker-compose.yml config" : {
+        "docker-compose-userdefined -f F:\\dir2\\docker-compose.yml config": {
             "code": 0,
             "stdout": "services:\n  redis:\n    image: redis:alpine\n  web:\n    build:\n      context: C:\\docketest\n    ports:\n    - 5000:5000/tcp\n    volumes:\n    - C:\\docketest:/code:rw\nversion: '2.0'"
         },
@@ -84,11 +84,11 @@ let a: any = <any>{
             "code": 0,
             "stdout": "sucessfully ran services"
         },
-        "docker-compose -f F:\\dir2\\docker-compose.yml build --pull --parallel" : {
+        "docker-compose -f F:\\dir2\\docker-compose.yml build --pull --parallel": {
             "code": 0,
             "stdout": "sucessfully built the service images"
         },
-        "docker compose -f F:\\dir2\\docker-compose.yml build --pull --parallel" : {
+        "docker compose -f F:\\dir2\\docker-compose.yml build --pull --parallel": {
             "code": 0,
             "stdout": "sucessfully built the service images"
         },
@@ -128,11 +128,11 @@ let a: any = <any>{
             "code": 0,
             "stdout": "successfully ran up command"
         },
-        "docker-compose -f F:\\dir2\\docker-compose.yml pull service1 service2" : {
+        "docker-compose -f F:\\dir2\\docker-compose.yml pull service1 service2": {
             "code": 0,
             "stdout": "successfully pulled the passed service images"
         },
-        "docker compose -f F:\\dir2\\docker-compose.yml pull service1 service2" : {
+        "docker compose -f F:\\dir2\\docker-compose.yml pull service1 service2": {
             "code": 0,
             "stdout": "successfully pulled the passed service images"
         }

_generated/DockerComposeV0/dockercomposeconnection.ts

@@ -93,7 +93,7 @@ export default class DockerComposeConnection extends ContainerConnection {
     public createComposeCommand(): tr.ToolRunner {
         var command = tl.tool(this.dockerComposePath);
 
-        if (!tl.getInput('dockerComposePath')) {
+        if (!tl.getInput('dockerComposePath') && !this.dockerComposePath.includes("docker-compose")) {
             command.arg("compose");
             process.env["COMPOSE_COMPATIBILITY"] = "true";
         }
@@ -184,10 +184,10 @@ export default class DockerComposeConnection extends ContainerConnection {
         //Priority to docker-compose path provided by user
         this.dockerComposePath = tl.getInput('dockerComposePath');
         if (!this.dockerComposePath) {
-            this.dockerComposePath = tl.which("docker");
+            this.dockerComposePath = tl.which("docker-compose");
 
             if (!this.dockerComposePath) {
-                this.dockerComposePath = tl.which("docker-compose");
+                this.dockerComposePath = tl.which("docker");
             }
 
             if (!this.dockerComposePath) {

_generated/DockerComposeV0/task.json

@@ -14,7 +14,7 @@
   "version": {
     "Major": 0,
     "Minor": 242,
-    "Patch": 8
+    "Patch": 10
   },
   "demands": [],
   "preview": "false",
@@ -362,7 +362,7 @@
     "MigrateToDockerComposeV2": "The task is using Docker Compose V1, which is end-of-life and will be removed from Microsoft-hosted agents July 24. Pipelines running on Microsoft-hosted agents should be updated for Docker Compose v2 compatibility e.g. use compatible container names. For guidance on required updates, please refer to the official Docker Compose documentation at https://docs.docker.com/compose/migrate/"
   },
   "_buildConfigMapping": {
-    "Default": "0.242.8",
-    "Node20_229_2": "0.242.9"
+    "Default": "0.242.10",
+    "Node20_229_2": "0.242.11"
   }
 }

_generated/DockerComposeV0/task.loc.json

@@ -14,7 +14,7 @@
   "version": {
     "Major": 0,
     "Minor": 242,
-    "Patch": 8
+    "Patch": 10
   },
   "demands": [],
   "preview": "false",
@@ -362,7 +362,7 @@
     "MigrateToDockerComposeV2": "ms-resource:loc.messages.MigrateToDockerComposeV2"
   },
   "_buildConfigMapping": {
-    "Default": "0.242.8",
-    "Node20_229_2": "0.242.9"
+    "Default": "0.242.10",
+    "Node20_229_2": "0.242.11"
   }
 }

_generated/DockerComposeV0_Node20/Tests/L0.ts

@@ -8,7 +8,7 @@ describe('Docker Compose Suite', function() {
     let composeCommand: string;
 
     before(() => {
-        composeCommand = "docker compose";
+        composeCommand = "docker-compose";
     });
 
     beforeEach(() => {

_generated/DockerComposeV0_Node20/Tests/L0Windows.ts

@@ -48,27 +48,27 @@ let a: any = <any>{
         "docker-compose": true
     },
     "exec": {
-        "docker-compose -f F:\\dir2\\docker-compose.yml build" : {
+        "docker-compose -f F:\\dir2\\docker-compose.yml build": {
             "code": 0,
             "stdout": "sucessfully built the service images"
         },
-        "docker compose -f F:\\dir2\\docker-compose.yml build" : {
+        "docker compose -f F:\\dir2\\docker-compose.yml build": {
             "code": 0,
             "stdout": "sucessfully built the service images"
         },
-        "docker-compose-userdefined -f F:\\dir2\\docker-compose.yml build" : {
+        "docker-compose-userdefined -f F:\\dir2\\docker-compose.yml build": {
             "code": 0,
             "stdout": "sucessfully built the service images"
         },
-        "docker-compose -f F:\\dir2\\docker-compose.yml config" : {
+        "docker-compose -f F:\\dir2\\docker-compose.yml config": {
             "code": 0,
             "stdout": "services:\n  redis:\n    image: redis:alpine\n  web:\n    build:\n      context: C:\\docketest\n    ports:\n    - 5000:5000/tcp\n    volumes:\n    - C:\\docketest:/code:rw\nversion: '2.0'"
         },
-        "docker compose -f F:\\dir2\\docker-compose.yml config" : {
+        "docker compose -f F:\\dir2\\docker-compose.yml config": {
             "code": 0,
             "stdout": "services:\n  redis:\n    image: redis:alpine\n  web:\n    build:\n      context: C:\\docketest\n    ports:\n    - 5000:5000/tcp\n    volumes:\n    - C:\\docketest:/code:rw\nversion: '2.0'"
         },
-        "docker-compose-userdefined -f F:\\dir2\\docker-compose.yml config" : {
+        "docker-compose-userdefined -f F:\\dir2\\docker-compose.yml config": {
             "code": 0,
             "stdout": "services:\n  redis:\n    image: redis:alpine\n  web:\n    build:\n      context: C:\\docketest\n    ports:\n    - 5000:5000/tcp\n    volumes:\n    - C:\\docketest:/code:rw\nversion: '2.0'"
         },
@@ -84,11 +84,11 @@ let a: any = <any>{
             "code": 0,
             "stdout": "sucessfully ran services"
         },
-        "docker-compose -f F:\\dir2\\docker-compose.yml build --pull --parallel" : {
+        "docker-compose -f F:\\dir2\\docker-compose.yml build --pull --parallel": {
             "code": 0,
             "stdout": "sucessfully built the service images"
         },
-        "docker compose -f F:\\dir2\\docker-compose.yml build --pull --parallel" : {
+        "docker compose -f F:\\dir2\\docker-compose.yml build --pull --parallel": {
             "code": 0,
             "stdout": "sucessfully built the service images"
         },
@@ -128,11 +128,11 @@ let a: any = <any>{
             "code": 0,
             "stdout": "successfully ran up command"
         },
-        "docker-compose -f F:\\dir2\\docker-compose.yml pull service1 service2" : {
+        "docker-compose -f F:\\dir2\\docker-compose.yml pull service1 service2": {
             "code": 0,
             "stdout": "successfully pulled the passed service images"
         },
-        "docker compose -f F:\\dir2\\docker-compose.yml pull service1 service2" : {
+        "docker compose -f F:\\dir2\\docker-compose.yml pull service1 service2": {
             "code": 0,
             "stdout": "successfully pulled the passed service images"
         }

_generated/DockerComposeV0_Node20/dockercomposeconnection.ts

@@ -93,7 +93,7 @@ export default class DockerComposeConnection extends ContainerConnection {
     public createComposeCommand(): tr.ToolRunner {
         var command = tl.tool(this.dockerComposePath);
 
-        if (!tl.getInput('dockerComposePath')) {
+        if (!tl.getInput('dockerComposePath') && !this.dockerComposePath.includes("docker-compose")) {
             command.arg("compose");
             process.env["COMPOSE_COMPATIBILITY"] = "true";
         }
@@ -184,10 +184,10 @@ export default class DockerComposeConnection extends ContainerConnection {
         //Priority to docker-compose path provided by user
         this.dockerComposePath = tl.getInput('dockerComposePath');
         if (!this.dockerComposePath) {
-            this.dockerComposePath = tl.which("docker");
+            this.dockerComposePath = tl.which("docker-compose");
 
             if (!this.dockerComposePath) {
-                this.dockerComposePath = tl.which("docker-compose");
+                this.dockerComposePath = tl.which("docker");
             }
 
             if (!this.dockerComposePath) {

_generated/DockerComposeV0_Node20/task.json

@@ -14,7 +14,7 @@
   "version": {
     "Major": 0,
     "Minor": 242,
-    "Patch": 9
+    "Patch": 11
   },
   "demands": [],
   "preview": "false",
@@ -366,7 +366,7 @@
     "MigrateToDockerComposeV2": "The task is using Docker Compose V1, which is end-of-life and will be removed from Microsoft-hosted agents July 24. Pipelines running on Microsoft-hosted agents should be updated for Docker Compose v2 compatibility e.g. use compatible container names. For guidance on required updates, please refer to the official Docker Compose documentation at https://docs.docker.com/compose/migrate/"
   },
   "_buildConfigMapping": {
-    "Default": "0.242.8",
-    "Node20_229_2": "0.242.9"
+    "Default": "0.242.10",
+    "Node20_229_2": "0.242.11"
   }
 }

_generated/DockerComposeV0_Node20/task.loc.json

@@ -14,7 +14,7 @@
   "version": {
     "Major": 0,
     "Minor": 242,
-    "Patch": 9
+    "Patch": 11
   },
   "demands": [],
   "preview": "false",
@@ -366,7 +366,7 @@
     "MigrateToDockerComposeV2": "ms-resource:loc.messages.MigrateToDockerComposeV2"
   },
   "_buildConfigMapping": {
-    "Default": "0.242.8",
-    "Node20_229_2": "0.242.9"
+    "Default": "0.242.10",
+    "Node20_229_2": "0.242.11"
   }
 }