Skip to content

Commit d29017f

Browse files
committed
TUN-8553: Bump go to 1.22.5 and go-boring 1.22.5-1
update docker files with go1.22.5 update windows scripts with go1.22.5
1 parent 6a6c890 commit d29017f

File tree

8 files changed

+13
-13
lines changed

8 files changed

+13
-13
lines changed

.teamcity/install-cloudflare-go.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
cd /tmp
44
git clone -q https://github.com/cloudflare/go
55
cd go/src
6-
# https://github.com/cloudflare/go/tree/ec0a014545f180b0c74dfd687698657a9e86e310 is version go1.22.2-devel-cf
7-
git checkout -q ec0a014545f180b0c74dfd687698657a9e86e310
8-
./make.bash
6+
# https://github.com/cloudflare/go/tree/f4334cdc0c3f22a3bfdd7e66f387e3ffc65a5c38 is version go1.22.5-devel-cf
7+
git checkout -q f4334cdc0c3f22a3bfdd7e66f387e3ffc65a5c38
8+
./make.bash

.teamcity/windows/install-cloudflare-go.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Set-Location "$Env:Temp"
99
git clone -q https://github.com/cloudflare/go
1010
Write-Output "Building go..."
1111
cd go/src
12-
# https://github.com/cloudflare/go/tree/ec0a014545f180b0c74dfd687698657a9e86e310 is version go1.22.2-devel-cf
13-
git checkout -q ec0a014545f180b0c74dfd687698657a9e86e310
12+
# https://github.com/cloudflare/go/tree/f4334cdc0c3f22a3bfdd7e66f387e3ffc65a5c38 is version go1.22.5-devel-cf
13+
git checkout -q f4334cdc0c3f22a3bfdd7e66f387e3ffc65a5c38
1414
& ./make.bat
1515

16-
Write-Output "Installed"
16+
Write-Output "Installed"

.teamcity/windows/install-go-msi.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
$ErrorActionPreference = "Stop"
22
$ProgressPreference = "SilentlyContinue"
3-
$GoMsiVersion = "go1.22.2.windows-amd64.msi"
3+
$GoMsiVersion = "go1.22.5.windows-amd64.msi"
44

55
Write-Output "Downloading go installer..."
66

@@ -17,4 +17,4 @@ Install-Package "$Env:Temp\$GoMsiVersion" -Force
1717
# Go installer updates global $PATH
1818
go env
1919

20-
Write-Output "Installed"
20+
Write-Output "Installed"

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# use a builder image for building cloudflare
22
ARG TARGET_GOOS
33
ARG TARGET_GOARCH
4-
FROM golang:1.22.2 as builder
4+
FROM golang:1.22.5 as builder
55
ENV GO111MODULE=on \
66
CGO_ENABLED=0 \
77
TARGET_GOOS=${TARGET_GOOS} \

Dockerfile.amd64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# use a builder image for building cloudflare
2-
FROM golang:1.22.2 as builder
2+
FROM golang:1.22.5 as builder
33
ENV GO111MODULE=on \
44
CGO_ENABLED=0
55

Dockerfile.arm64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# use a builder image for building cloudflare
2-
FROM golang:1.22.2 as builder
2+
FROM golang:1.22.5 as builder
33
ENV GO111MODULE=on \
44
CGO_ENABLED=0
55

cfsetup.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pinned_go: &pinned_go go-boring=1.22.2-1
1+
pinned_go: &pinned_go go-boring=1.22.5-1
22

33
build_dir: &build_dir /cfsetup_build
44
default-flavor: bullseye

dev.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22.2 as builder
1+
FROM golang:1.22.5 as builder
22
ENV GO111MODULE=on \
33
CGO_ENABLED=0
44
WORKDIR /go/src/github.com/cloudflare/cloudflared/

0 commit comments

Comments
 (0)