diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c8dd1ca20..40873df5b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: - name: Set up Go uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0 with: - go-version: "1.25.4" + go-version: "1.25.5" cache: true - name: Lint @@ -42,7 +42,7 @@ jobs: - name: Set up Go uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0 with: - go-version: "1.25.4" + go-version: "1.25.5" cache: true - name: Install Task @@ -62,7 +62,7 @@ jobs: - name: Set up Go uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0 with: - go-version: "1.25.4" + go-version: "1.25.5" cache: true - name: Install go-licences @@ -81,7 +81,7 @@ jobs: - name: Set up Go uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0 with: - go-version: "1.25.4" + go-version: "1.25.5" cache: true - name: Install Task diff --git a/AGENTS.md b/AGENTS.md index a49c61daa..c315a7fa1 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -829,7 +829,7 @@ task build # Should create ./bin/cagent - Manual workflow dispatch **Build Configuration:** -- Go version: 1.25.4 +- Go version: 1.25.5 - Platforms: linux/amd64, linux/arm64, darwin/amd64, darwin/arm64, windows/amd64, windows/arm64 - Binary name: `cagent` (or `cagent.exe` on Windows) - Version injection: Uses git tag and commit SHA via ldflags diff --git a/Dockerfile b/Dockerfile index 5b78b1a83..820f384c7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION="1.25.4" +ARG GO_VERSION="1.25.5" ARG ALPINE_VERSION="3.22" # xx is a helper for cross-compilation @@ -72,7 +72,7 @@ COPY --from=builder /binaries/cagent-$TARGETOS-$TARGETARCH* cagent FROM scratch AS cross COPY --from=builder /binaries . -FROM alpine +FROM alpine:${ALPINE_VERSION} RUN apk add --no-cache ca-certificates docker-cli RUN addgroup -S cagent && adduser -S -G cagent cagent ARG TARGETOS TARGETARCH diff --git a/go.mod b/go.mod index 56b1545a1..c21cd2df2 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/docker/cagent -go 1.25.4 +go 1.25.5 require ( charm.land/bubbles/v2 v2.0.0-rc.1