actions/runner-images-temp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Ubuntu, Windows] Update Docker tools versions (#9982)

Browse Source 
Co-authored-by: Taleh Zaliyev <[email protected]>
This commit is contained in:
Erik Bershel
2024-06-05 12:27:31 +02:00
committed by GitHub
co-authored by Taleh Zaliyev
parent 3a10719283
commit 7992e7f1ba
6 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
images/ubuntu/toolsets/toolset-2004.json
+3 -3
View File
@@ -233,11 +233,11 @@
}, },
{ {
"package": "docker-ce-cli", "package": "docker-ce-cli",
"version": "24.0.9" "version": "26.1.3"
}, },
{ {
"package": "docker-ce", "package": "docker-ce",
"version": "24.0.9" "version": "26.1.3"
} }
], ],
"plugins": [ "plugins": [
@@ -248,7 +248,7 @@
}, },
{ {
"plugin": "compose", "plugin": "compose",
"version": "2.23.3", "version": "2.27.1",
"asset": "linux-x86_64" "asset": "linux-x86_64"
} }
] ]
images/ubuntu/toolsets/toolset-2204.json
+3 -3
View File
@@ -232,11 +232,11 @@
}, },
{ {
"package": "docker-ce-cli", "package": "docker-ce-cli",
"version": "24.0.9" "version": "26.1.3"
}, },
{ {
"package": "docker-ce", "package": "docker-ce",
"version": "24.0.9" "version": "26.1.3"
} }
], ],
"plugins": [ "plugins": [
@@ -247,7 +247,7 @@
}, },
{ {
"plugin": "compose", "plugin": "compose",
"version": "2.23.3", "version": "2.27.1",
"asset": "linux-x86_64" "asset": "linux-x86_64"
} }
] ]
images/ubuntu/toolsets/toolset-2404.json
+3 -3
View File
@@ -188,11 +188,11 @@
}, },
{ {
"package": "docker-ce-cli", "package": "docker-ce-cli",
"version": "26.1.0" "version": "26.1.3"
}, },
{ {
"package": "docker-ce", "package": "docker-ce",
"version": "26.1.0" "version": "26.1.3"
} }
], ],
"plugins": [ "plugins": [
@@ -203,7 +203,7 @@
}, },
{ {
"plugin": "compose", "plugin": "compose",
"version": "latest", "version": "2.27.1",
"asset": "linux-x86_64" "asset": "linux-x86_64"
} }
] ]
images/windows/scripts/build/Install-DockerCompose.ps1
-1
View File
@@ -17,7 +17,6 @@ Add-MachinePathItem $dockerComposev1Dir
Update-Environment Update-Environment
Write-Host "Install-Package Docker-Compose v2" 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 $toolsetVersion = (Get-ToolsetContent).docker.components.compose
$composeVersion = (Get-GithubReleasesByVersion -Repo "docker/compose" -Version "${toolsetVersion}").version $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" $dockerComposev2Url = "https://github.com/docker/compose/releases/download/v${composeVersion}/docker-compose-windows-x86_64.exe"
images/windows/toolsets/toolset-2019.json
+2 -2
View File
@@ -369,8 +369,8 @@
"mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019" "mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019"
], ],
"components": { "components": {
"docker": "24.0.7", "docker": "26.1.3",
"compose": "2.23.3" "compose": "2.27.1"
} }
}, },
"pipx": [ "pipx": [
images/windows/toolsets/toolset-2022.json
+2 -2
View File
@@ -278,8 +278,8 @@
"mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022" "mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022"
], ],
"components": { "components": {
"docker": "24.0.7", "docker": "26.1.3",
"compose": "2.23.3" "compose": "2.27.1"
} }
}, },
"pipx": [ "pipx": [