From 11b367747fa0e9778d85d50333d652cf21c61534 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Dec 2025 09:02:13 +0000 Subject: [PATCH 1/2] chore(deps): bump golang from 1.25.4-alpine3.22 to 1.25.5-alpine3.22 Bumps golang from 1.25.4-alpine3.22 to 1.25.5-alpine3.22. --- updated-dependencies: - dependency-name: golang dependency-version: 1.25.5-alpine3.22 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5d654a030..ff8022488 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.25.4-alpine3.22 AS build +FROM --platform=$BUILDPLATFORM golang:1.25.5-alpine3.22 AS build RUN apk add --no-cache make git From a5050fb265b28fa6eaf32120236981d80631b259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakob=20M=C3=B6ller?= Date: Tue, 23 Dec 2025 10:02:13 +0100 Subject: [PATCH 2/2] chore: also bump go mods MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jakob Möller --- README.md | 2 +- components/helminstaller/Dockerfile | 2 +- go.mod | 2 +- hack/brew/go.mod | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 2570a962c..b7800f85c 100644 --- a/README.md +++ b/README.md @@ -144,7 +144,7 @@ You can pass in the following arguments to override the predefined defaults: Please check [hub.docker.com](https://hub.docker.com/_/golang/tags?page=1&name=alpine) for possible version combinations. ```bash -podman build -t ocm --build-arg GO_VERSION=1.25.4 --build-arg ALPINE_VERSION=3.21 --build-arg GO_PROXY=https://proxy.golang.org . +podman build -t ocm --build-arg GO_VERSION=1.25.5 --build-arg ALPINE_VERSION=3.21 --build-arg GO_PROXY=https://proxy.golang.org . ``` ### Chocolatey diff --git a/components/helminstaller/Dockerfile b/components/helminstaller/Dockerfile index b850b065c..ac21a7012 100644 --- a/components/helminstaller/Dockerfile +++ b/components/helminstaller/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.25.4 AS builder +FROM --platform=$BUILDPLATFORM golang:1.25.5 AS builder ARG COMMIT EFFECTIVE_VERSION GIT_TREE_STATE ARG TARGETOS TARGETARCH diff --git a/go.mod b/go.mod index 54b92e3d8..9e31b0ead 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module ocm.software/ocm -go 1.25.4 +go 1.25.5 require ( dario.cat/mergo v1.0.2 diff --git a/hack/brew/go.mod b/hack/brew/go.mod index 4b9d9ad14..fdb07f33b 100644 --- a/hack/brew/go.mod +++ b/hack/brew/go.mod @@ -1,3 +1,3 @@ module ocm.software/ocm/hack/brew -go 1.25.4 +go 1.25.5