From 2b456b9a792eac54466aab2a9b2321a94c4d59c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20=22Pisco=22=20Fernandes?= Date: Thu, 23 Oct 2025 10:54:18 +0100 Subject: [PATCH] TUN-9954: Update from go1.24.6 to go1.24.9 --- .ci/image/Dockerfile | 2 +- .gitlab-ci.yml | 2 +- Dockerfile | 2 +- Dockerfile.amd64 | 2 +- Dockerfile.arm64 | 2 +- cfsetup.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.ci/image/Dockerfile b/.ci/image/Dockerfile index 4e92860e..d2766e09 100644 --- a/.ci/image/Dockerfile +++ b/.ci/image/Dockerfile @@ -7,7 +7,7 @@ RUN apt-get update && \ apt-get install --no-install-recommends --allow-downgrades -y \ build-essential \ git \ - go-boring=1.24.6-1 \ + go-boring=1.24.9-1 \ libffi-dev \ procps \ python3-dev \ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c9673553..5a0ab560 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - GO_VERSION: "go1.24.6" + GO_VERSION: "go1.24.9" GIT_DEPTH: "0" default: diff --git a/Dockerfile b/Dockerfile index fd1676e2..d861f82c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # use a builder image for building cloudflare ARG TARGET_GOOS ARG TARGET_GOARCH -FROM golang:1.24.4 AS builder +FROM golang:1.24.9 AS builder ENV GO111MODULE=on \ CGO_ENABLED=0 \ TARGET_GOOS=${TARGET_GOOS} \ diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index b00ed3cb..c28b5679 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -1,5 +1,5 @@ # use a builder image for building cloudflare -FROM golang:1.24.4 AS builder +FROM golang:1.24.9 AS builder ENV GO111MODULE=on \ CGO_ENABLED=0 \ # the CONTAINER_BUILD envvar is used set github.com/cloudflare/cloudflared/metrics.Runtime=virtual diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 3bf0ebbf..79b3147f 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,5 +1,5 @@ # use a builder image for building cloudflare -FROM golang:1.24.4 AS builder +FROM golang:1.24.9 AS builder ENV GO111MODULE=on \ CGO_ENABLED=0 \ # the CONTAINER_BUILD envvar is used set github.com/cloudflare/cloudflared/metrics.Runtime=virtual diff --git a/cfsetup.yaml b/cfsetup.yaml index f58ee5ed..b007312c 100644 --- a/cfsetup.yaml +++ b/cfsetup.yaml @@ -1,4 +1,4 @@ -pinned_go: &pinned_go go-boring=1.24.4-1 +pinned_go: &pinned_go go-boring=1.24.9-1 build_dir: &build_dir /cfsetup_build default-flavor: bookworm