From d2dea98617439009b5057989b4bb1c6316241428 Mon Sep 17 00:00:00 2001
From: Taleh Zaliyev <z.taleh007@ya.ru>
Date: Thu, 9 May 2024 14:27:55 +0300
Subject: [PATCH] [Ubuntu, Windows] Update Docker tools versions

---
 images/ubuntu/toolsets/toolset-2004.json               | 6 +++---
 images/ubuntu/toolsets/toolset-2204.json               | 8 ++++----
 images/ubuntu/toolsets/toolset-2404.json               | 6 +++---
 images/windows/scripts/build/Install-DockerCompose.ps1 | 1 -
 images/windows/toolsets/toolset-2019.json              | 6 +++---
 images/windows/toolsets/toolset-2022.json              | 6 +++---
 6 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json
index 033ff8bc6f7f..947d673b8b60 100644
--- a/images/ubuntu/toolsets/toolset-2004.json
+++ b/images/ubuntu/toolsets/toolset-2004.json
@@ -233,11 +233,11 @@
             },
             {
                 "package": "docker-ce-cli",
-                "version": "24.0.9"
+                "version": "26.1.3"
             },
             {
                 "package": "docker-ce",
-                "version": "24.0.9"
+                "version": "26.1.3"
             }
         ],
         "plugins": [
@@ -248,7 +248,7 @@
             },
             {
                 "plugin": "compose",
-                "version": "2.23.3",
+                "version": "2.27.1",
                 "asset": "linux-x86_64"
             }
         ]
diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json
index 0862612b01ab..cea32ac5b4f5 100644
--- a/images/ubuntu/toolsets/toolset-2204.json
+++ b/images/ubuntu/toolsets/toolset-2204.json
@@ -232,11 +232,11 @@
             },
             {
                 "package": "docker-ce-cli",
-                "version": "24.0.9"
+                "version": "26.1.3"
             },
             {
                 "package": "docker-ce",
-                "version": "24.0.9"
+                "version": "26.1.3"
             }
         ],
         "plugins": [
@@ -244,10 +244,10 @@
                 "plugin": "buildx",
                 "version": "latest",
                 "asset": "linux-amd64"
-            },            
+            },
             {
                 "plugin": "compose",
-                "version": "2.23.3",
+                "version": "2.27.1",
                 "asset": "linux-x86_64"
             }
         ]
diff --git a/images/ubuntu/toolsets/toolset-2404.json b/images/ubuntu/toolsets/toolset-2404.json
index c8a023811b11..bd0cf3565caa 100644
--- a/images/ubuntu/toolsets/toolset-2404.json
+++ b/images/ubuntu/toolsets/toolset-2404.json
@@ -188,11 +188,11 @@
             },
             {
                 "package": "docker-ce-cli",
-                "version": "26.1.0"
+                "version": "26.1.3"
             },
             {
                 "package": "docker-ce",
-                "version": "26.1.0"
+                "version": "26.1.3"
             }
         ],
         "plugins": [
@@ -203,7 +203,7 @@
             },
             {
                 "plugin": "compose",
-                "version": "latest",
+                "version": "2.27.1",
                 "asset": "linux-x86_64"
             }
         ]
diff --git a/images/windows/scripts/build/Install-DockerCompose.ps1 b/images/windows/scripts/build/Install-DockerCompose.ps1
index dba8904a36b6..d53ed20047dc 100644
--- a/images/windows/scripts/build/Install-DockerCompose.ps1
+++ b/images/windows/scripts/build/Install-DockerCompose.ps1
@@ -17,7 +17,6 @@ Add-MachinePathItem $dockerComposev1Dir
 Update-Environment
 
 Write-Host "Install-Package Docker-Compose v2"
-# Temporaty pinned to v2.23.3 due https://github.com/actions/runner-images/issues/9172
 $toolsetVersion = (Get-ToolsetContent).docker.components.compose
 $composeVersion = (Get-GithubReleasesByVersion -Repo "docker/compose" -Version "${toolsetVersion}").version
 $dockerComposev2Url = "https://github.com/docker/compose/releases/download/v${composeVersion}/docker-compose-windows-x86_64.exe"
diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json
index 77447cca0d8b..1c8bd715eaf6 100644
--- a/images/windows/toolsets/toolset-2019.json
+++ b/images/windows/toolsets/toolset-2019.json
@@ -369,9 +369,9 @@
             "mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019"
         ],
         "components": {
-            "docker": "24.0.7",
-            "compose": "2.23.3"
-        }   
+            "docker": "26.1.3",
+            "compose": "2.27.1"
+        }
     },
     "pipx": [
         {
diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json
index 90c96cb362a0..6af096fe7536 100644
--- a/images/windows/toolsets/toolset-2022.json
+++ b/images/windows/toolsets/toolset-2022.json
@@ -121,7 +121,7 @@
                 "11.3.1"
             ],
             "zip_versions": [
-    
+
             ]
         }
     ],
@@ -278,8 +278,8 @@
             "mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022"
         ],
         "components": {
-            "docker": "24.0.7",
-            "compose": "2.23.3"
+            "docker": "26.1.3",
+            "compose": "2.27.1"
         }
     },
     "pipx": [