Skip to content

Commit 68ce979

Browse files
D3-LucaPiombinoLuca Piombino
andauthored
Bump docker binaries versions (docker: 28.2.2, compose: 2.36.2, buildx: 0.24.0) (#10)
## Summary of the Pull Request Update docker (and related tooling) to the latest version. ## Detailed Description of the Pull Request / Additional comments The core motivation is to have a version of the docker client that does not attempt to mutate/rewrite the config (docker/cli#5553). This is in preparation of a future enhancement to share the same client configuration of the windows host and to provide a seamless experience. This could include also the auth via credential helpers running on the host (e.g. a basic scenario is to at least use the windows credential manager to avoid storing static credentials in plain in the config file). I did not push anything yet because i am waiting to see if docker/cli#5948 get merged as it would probably provide a better and simpler out of the box experience. Co-authored-by: Luca Piombino <[email protected]>
1 parent 1815e1c commit 68ce979

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

.github/workflows/main.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,23 @@ on:
2525
workflow_dispatch:
2626

2727
env:
28-
DOCKER_VERSION: "26.1.4"
29-
DOCKER_COMPOSE_VERSION: "v2.27.1"
30-
DOCKER_BUILDX_VERSION: "v0.15.0"
28+
DOCKER_VERSION: "28.2.2"
29+
DOCKER_COMPOSE_VERSION: "v2.36.2"
30+
DOCKER_BUILDX_VERSION: "v0.24.0"
3131
GO_VERSION: "1.22"
3232
GO_DNSMASQ: "1.0.7"
3333
REGISTRY: ghcr.io
3434
# Need to be resolved dynamically as there is no lowercase function
3535
# for templated expressions!
3636
# See also: https://github.com/orgs/community/discussions/25768
3737
# org
38-
GITHUB_REPOSITORY_OWNER_LC:
38+
GITHUB_REPOSITORY_OWNER_LC: ''
3939
# org/repo
40-
GITHUB_REPOSITORY_LC:
40+
GITHUB_REPOSITORY_LC: ''
4141
# registry/org
42-
REGISTRY_BASE_IMAGE_PATH:
42+
REGISTRY_BASE_IMAGE_PATH: ''
4343
# registry/org/repo
44-
DEFAULT_FULL_IMAGE_NAME:
44+
DEFAULT_FULL_IMAGE_NAME: ''
4545
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
4646
jobs:
4747
# This workflow contains a single job called "build"

build.ps1

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
# - dotnet 6.0 SDK
33
# - docker
44
# This script must run on Windows because the application is a Windows application.
5-
$DOCKER_VERSION="26.1.4"
6-
$DOCKER_COMPOSE_VERSION="v2.27.1"
7-
$DOCKER_BUILDX_VERSION="v0.15.0"
5+
$DOCKER_VERSION="28.2.2"
6+
$DOCKER_COMPOSE_VERSION="v2.36.2"
7+
$DOCKER_BUILDX_VERSION="v0.24.0"
8+
$GO_DNSMASQ="1.0.7"
89
$GO_VERSION="1.22"
910
function ExitOnFailure([string] $message, [string] $sha) {
1011
if (($LastExitCode -ne 0) -or (-not $?)) {
@@ -57,7 +58,7 @@ ExitOnFailure("Failed to download WSL Kernel MSI")
5758
# Download dns-forwarder (go-dnsmasq)
5859
docker run --rm -v "$($PWD):/src" container-desktop-tools:build sh -c "mkdir -p /src/dist/bin/"
5960
ExitOnFailure("Failed to download dns-forwarder")
60-
docker run --rm -v "$($PWD):/src" container-desktop-tools:build sh -c "curl -L -o /src/dist/bin/dns-forwarder https://github.com/janeczku/go-dnsmasq/releases/download/1.0.7/go-dnsmasq-min_linux-amd64"
61+
docker run --rm -v "$($PWD):/src" container-desktop-tools:build sh -c "curl -L -o /src/dist/bin/dns-forwarder https://github.com/janeczku/go-dnsmasq/releases/download/$GO_DNSMASQ/go-dnsmasq-min_linux-amd64"
6162
ExitOnFailure("Failed to download dns-forwarder")
6263
# Build proxy for Windows and Linux and copy to /dist
6364
docker run --rm -v "go-packages-cache:/go/pkg/mod" -v "$($PWD):/go/src" -w /go/src/cmd/container-desktop-proxy -e CGO_ENABLED=0 -e GOOS=windows -e GOARCH=amd64 golang:$GO_VERSION go build -v -o /go/src/dist/container-desktop-proxy-windows-amd64.exe

0 commit comments

Comments
 (0)