Skip to content

Commit ce5c009

Browse files
Rustamchukru.nazarov
andauthored
build pkg golang-1.24 (#2155)
Co-authored-by: ru.nazarov <ru.nazarov@vkteam.ru>
1 parent b4919fc commit ce5c009

File tree

5 files changed

+62
-62
lines changed

5 files changed

+62
-62
lines changed

build/golang-debian/golang-1.23-buster.Dockerfile renamed to build/golang-debian/golang-1.24-buster.Dockerfile

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,44 +8,44 @@ FROM buildpack-deps:buster-scm AS build
88

99
ENV PATH=/usr/local/go/bin:$PATH
1010

11-
ENV GOLANG_VERSION=1.23.12
11+
ENV GOLANG_VERSION=1.24.11
1212

1313
RUN set -eux; \
1414
now="$(date '+%s')"; \
1515
arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \
1616
url=; \
1717
case "$arch" in \
1818
'amd64') \
19-
url='https://dl.google.com/go/go1.23.12.linux-amd64.tar.gz'; \
20-
sha256='d3847fef834e9db11bf64e3fb34db9c04db14e068eeb064f49af747010454f90'; \
19+
url='https://dl.google.com/go/go1.24.11.linux-amd64.tar.gz'; \
20+
sha256='bceca00afaac856bc48b4cc33db7cd9eb383c81811379faed3bdbc80edb0af65'; \
2121
;; \
2222
'armhf') \
23-
url='https://dl.google.com/go/go1.23.12.linux-armv6l.tar.gz'; \
24-
sha256='9704eba01401a3793f54fac162164b9c5d8cc6f3cab5cee72684bb72294d9f41'; \
23+
url='https://dl.google.com/go/go1.24.11.linux-armv6l.tar.gz'; \
24+
sha256='24d712a7e8ea2f429c05bc67287249e0291f2fe0ea6d6ff268f11b7343ad0f47'; \
2525
;; \
2626
'arm64') \
27-
url='https://dl.google.com/go/go1.23.12.linux-arm64.tar.gz'; \
28-
sha256='52ce172f96e21da53b1ae9079808560d49b02ac86cecfa457217597f9bc28ab3'; \
27+
url='https://dl.google.com/go/go1.24.11.linux-arm64.tar.gz'; \
28+
sha256='beaf0f51cbe0bd71b8289b2b6fa96c0b11cd86aa58672691ef2f1de88eb621de'; \
2929
;; \
3030
'i386') \
31-
url='https://dl.google.com/go/go1.23.12.linux-386.tar.gz'; \
32-
sha256='3b2fd446e26642555d1446a38ccbefb2a30bba3179d3ef132ed64d3c63b0c42a'; \
31+
url='https://dl.google.com/go/go1.24.11.linux-386.tar.gz'; \
32+
sha256='bb702d0b67759724dccee1825828e8bae0b5199e3295cac5a98a81f3098fa64a'; \
3333
;; \
3434
'mips64el') \
35-
url='https://dl.google.com/go/go1.23.12.linux-mips64le.tar.gz'; \
36-
sha256='d686184c7b374d1a5048aef5dc26b7b6061e532f402361f300e809e00da2e76a'; \
35+
url='https://dl.google.com/go/go1.24.11.linux-mips64le.tar.gz'; \
36+
sha256='c0274255613b85e2ba45e210e8f07995d51a048f11c7f0b9128dc177472692b3'; \
3737
;; \
3838
'ppc64el') \
39-
url='https://dl.google.com/go/go1.23.12.linux-ppc64le.tar.gz'; \
40-
sha256='1a7cc5f7baeaf39125dce5d660a39438e7f0e04d13d3498590d240aae976b565'; \
39+
url='https://dl.google.com/go/go1.24.11.linux-ppc64le.tar.gz'; \
40+
sha256='f770d0c5d7e7e2edb030133ac7854d9204f4e954e79a176e81362ffedf6ea34c'; \
4141
;; \
4242
'riscv64') \
43-
url='https://dl.google.com/go/go1.23.12.linux-riscv64.tar.gz'; \
44-
sha256='5798eda8c167dd620feb54e1bcca1b4cc014a529821d8c01f31d7e17a43cb8ed'; \
43+
url='https://dl.google.com/go/go1.24.11.linux-riscv64.tar.gz'; \
44+
sha256='9db9ba8e6b60f3662f55ed78b128175edbe8b9480e657126a5b8f5043ee1e38c'; \
4545
;; \
4646
's390x') \
47-
url='https://dl.google.com/go/go1.23.12.linux-s390x.tar.gz'; \
48-
sha256='2f43708aa0922d692da0a1fc775475c343907610bec77002de1bbe37601ea338'; \
47+
url='https://dl.google.com/go/go1.24.11.linux-s390x.tar.gz'; \
48+
sha256='5955ddda3445b2cbfd81b8772044084911f55d0baeb32414da0411f6a377a2d4'; \
4949
;; \
5050
*) echo >&2 "error: unsupported architecture '$arch' (likely packaging update needed)"; exit 1 ;; \
5151
esac; \
@@ -134,7 +134,7 @@ RUN set -eux; \
134134
fi; \
135135
rm -rf /var/lib/apt/lists/*
136136

137-
ENV GOLANG_VERSION=1.23.12
137+
ENV GOLANG_VERSION=1.24.11
138138

139139
# don't auto-upgrade the gotoolchain
140140
# https://github.com/docker-library/golang/issues/472

build/golang-ubuntu/golang-1.23-focal.Dockerfile renamed to build/golang-ubuntu/golang-1.24-focal.Dockerfile

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,44 +8,44 @@ FROM buildpack-deps:focal-scm AS build
88

99
ENV PATH=/usr/local/go/bin:$PATH
1010

11-
ENV GOLANG_VERSION=1.23.12
11+
ENV GOLANG_VERSION=1.24.11
1212

1313
RUN set -eux; \
1414
now="$(date '+%s')"; \
1515
arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \
1616
url=; \
1717
case "$arch" in \
1818
'amd64') \
19-
url='https://dl.google.com/go/go1.23.12.linux-amd64.tar.gz'; \
20-
sha256='d3847fef834e9db11bf64e3fb34db9c04db14e068eeb064f49af747010454f90'; \
19+
url='https://dl.google.com/go/go1.24.11.linux-amd64.tar.gz'; \
20+
sha256='bceca00afaac856bc48b4cc33db7cd9eb383c81811379faed3bdbc80edb0af65'; \
2121
;; \
2222
'armhf') \
23-
url='https://dl.google.com/go/go1.23.12.linux-armv6l.tar.gz'; \
24-
sha256='9704eba01401a3793f54fac162164b9c5d8cc6f3cab5cee72684bb72294d9f41'; \
23+
url='https://dl.google.com/go/go1.24.11.linux-armv6l.tar.gz'; \
24+
sha256='24d712a7e8ea2f429c05bc67287249e0291f2fe0ea6d6ff268f11b7343ad0f47'; \
2525
;; \
2626
'arm64') \
27-
url='https://dl.google.com/go/go1.23.12.linux-arm64.tar.gz'; \
28-
sha256='52ce172f96e21da53b1ae9079808560d49b02ac86cecfa457217597f9bc28ab3'; \
27+
url='https://dl.google.com/go/go1.24.11.linux-arm64.tar.gz'; \
28+
sha256='beaf0f51cbe0bd71b8289b2b6fa96c0b11cd86aa58672691ef2f1de88eb621de'; \
2929
;; \
3030
'i386') \
31-
url='https://dl.google.com/go/go1.23.12.linux-386.tar.gz'; \
32-
sha256='3b2fd446e26642555d1446a38ccbefb2a30bba3179d3ef132ed64d3c63b0c42a'; \
31+
url='https://dl.google.com/go/go1.24.11.linux-386.tar.gz'; \
32+
sha256='bb702d0b67759724dccee1825828e8bae0b5199e3295cac5a98a81f3098fa64a'; \
3333
;; \
3434
'mips64el') \
35-
url='https://dl.google.com/go/go1.23.12.linux-mips64le.tar.gz'; \
36-
sha256='d686184c7b374d1a5048aef5dc26b7b6061e532f402361f300e809e00da2e76a'; \
35+
url='https://dl.google.com/go/go1.24.11.linux-mips64le.tar.gz'; \
36+
sha256='c0274255613b85e2ba45e210e8f07995d51a048f11c7f0b9128dc177472692b3'; \
3737
;; \
3838
'ppc64el') \
39-
url='https://dl.google.com/go/go1.23.12.linux-ppc64le.tar.gz'; \
40-
sha256='1a7cc5f7baeaf39125dce5d660a39438e7f0e04d13d3498590d240aae976b565'; \
39+
url='https://dl.google.com/go/go1.24.11.linux-ppc64le.tar.gz'; \
40+
sha256='f770d0c5d7e7e2edb030133ac7854d9204f4e954e79a176e81362ffedf6ea34c'; \
4141
;; \
4242
'riscv64') \
43-
url='https://dl.google.com/go/go1.23.12.linux-riscv64.tar.gz'; \
44-
sha256='5798eda8c167dd620feb54e1bcca1b4cc014a529821d8c01f31d7e17a43cb8ed'; \
43+
url='https://dl.google.com/go/go1.24.11.linux-riscv64.tar.gz'; \
44+
sha256='9db9ba8e6b60f3662f55ed78b128175edbe8b9480e657126a5b8f5043ee1e38c'; \
4545
;; \
4646
's390x') \
47-
url='https://dl.google.com/go/go1.23.12.linux-s390x.tar.gz'; \
48-
sha256='2f43708aa0922d692da0a1fc775475c343907610bec77002de1bbe37601ea338'; \
47+
url='https://dl.google.com/go/go1.24.11.linux-s390x.tar.gz'; \
48+
sha256='5955ddda3445b2cbfd81b8772044084911f55d0baeb32414da0411f6a377a2d4'; \
4949
;; \
5050
*) echo >&2 "error: unsupported architecture '$arch' (likely packaging update needed)"; exit 1 ;; \
5151
esac; \
@@ -126,7 +126,7 @@ RUN set -eux; \
126126
fi; \
127127
rm -rf /var/lib/apt/lists/*
128128

129-
ENV GOLANG_VERSION=1.23.12
129+
ENV GOLANG_VERSION=1.24.11
130130

131131
# don't auto-upgrade the gotoolchain
132132
# https://github.com/docker-library/golang/issues/472

build/golang-ubuntu/golang-1.23-jammy.Dockerfile renamed to build/golang-ubuntu/golang-1.24-jammy.Dockerfile

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,44 +8,44 @@ FROM buildpack-deps:jammy-scm AS build
88

99
ENV PATH=/usr/local/go/bin:$PATH
1010

11-
ENV GOLANG_VERSION=1.23.12
11+
ENV GOLANG_VERSION=1.24.11
1212

1313
RUN set -eux; \
1414
now="$(date '+%s')"; \
1515
arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \
1616
url=; \
1717
case "$arch" in \
1818
'amd64') \
19-
url='https://dl.google.com/go/go1.23.12.linux-amd64.tar.gz'; \
20-
sha256='d3847fef834e9db11bf64e3fb34db9c04db14e068eeb064f49af747010454f90'; \
19+
url='https://dl.google.com/go/go1.24.11.linux-amd64.tar.gz'; \
20+
sha256='bceca00afaac856bc48b4cc33db7cd9eb383c81811379faed3bdbc80edb0af65'; \
2121
;; \
2222
'armhf') \
23-
url='https://dl.google.com/go/go1.23.12.linux-armv6l.tar.gz'; \
24-
sha256='9704eba01401a3793f54fac162164b9c5d8cc6f3cab5cee72684bb72294d9f41'; \
23+
url='https://dl.google.com/go/go1.24.11.linux-armv6l.tar.gz'; \
24+
sha256='24d712a7e8ea2f429c05bc67287249e0291f2fe0ea6d6ff268f11b7343ad0f47'; \
2525
;; \
2626
'arm64') \
27-
url='https://dl.google.com/go/go1.23.12.linux-arm64.tar.gz'; \
28-
sha256='52ce172f96e21da53b1ae9079808560d49b02ac86cecfa457217597f9bc28ab3'; \
27+
url='https://dl.google.com/go/go1.24.11.linux-arm64.tar.gz'; \
28+
sha256='beaf0f51cbe0bd71b8289b2b6fa96c0b11cd86aa58672691ef2f1de88eb621de'; \
2929
;; \
3030
'i386') \
31-
url='https://dl.google.com/go/go1.23.12.linux-386.tar.gz'; \
32-
sha256='3b2fd446e26642555d1446a38ccbefb2a30bba3179d3ef132ed64d3c63b0c42a'; \
31+
url='https://dl.google.com/go/go1.24.11.linux-386.tar.gz'; \
32+
sha256='bb702d0b67759724dccee1825828e8bae0b5199e3295cac5a98a81f3098fa64a'; \
3333
;; \
3434
'mips64el') \
35-
url='https://dl.google.com/go/go1.23.12.linux-mips64le.tar.gz'; \
36-
sha256='d686184c7b374d1a5048aef5dc26b7b6061e532f402361f300e809e00da2e76a'; \
35+
url='https://dl.google.com/go/go1.24.11.linux-mips64le.tar.gz'; \
36+
sha256='c0274255613b85e2ba45e210e8f07995d51a048f11c7f0b9128dc177472692b3'; \
3737
;; \
3838
'ppc64el') \
39-
url='https://dl.google.com/go/go1.23.12.linux-ppc64le.tar.gz'; \
40-
sha256='1a7cc5f7baeaf39125dce5d660a39438e7f0e04d13d3498590d240aae976b565'; \
39+
url='https://dl.google.com/go/go1.24.11.linux-ppc64le.tar.gz'; \
40+
sha256='f770d0c5d7e7e2edb030133ac7854d9204f4e954e79a176e81362ffedf6ea34c'; \
4141
;; \
4242
'riscv64') \
43-
url='https://dl.google.com/go/go1.23.12.linux-riscv64.tar.gz'; \
44-
sha256='5798eda8c167dd620feb54e1bcca1b4cc014a529821d8c01f31d7e17a43cb8ed'; \
43+
url='https://dl.google.com/go/go1.24.11.linux-riscv64.tar.gz'; \
44+
sha256='9db9ba8e6b60f3662f55ed78b128175edbe8b9480e657126a5b8f5043ee1e38c'; \
4545
;; \
4646
's390x') \
47-
url='https://dl.google.com/go/go1.23.12.linux-s390x.tar.gz'; \
48-
sha256='2f43708aa0922d692da0a1fc775475c343907610bec77002de1bbe37601ea338'; \
47+
url='https://dl.google.com/go/go1.24.11.linux-s390x.tar.gz'; \
48+
sha256='5955ddda3445b2cbfd81b8772044084911f55d0baeb32414da0411f6a377a2d4'; \
4949
;; \
5050
*) echo >&2 "error: unsupported architecture '$arch' (likely packaging update needed)"; exit 1 ;; \
5151
esac; \
@@ -126,7 +126,7 @@ RUN set -eux; \
126126
fi; \
127127
rm -rf /var/lib/apt/lists/*
128128

129-
ENV GOLANG_VERSION=1.23.12
129+
ENV GOLANG_VERSION=1.24.11
130130

131131
# don't auto-upgrade the gotoolchain
132132
# https://github.com/docker-library/golang/issues/472

build/make-pkg.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ GOCACHE=$PWD/build/go-cache
3131
mkdir -p "$GOCACHE"
3232

3333
if [[ $TAG == "ubuntu-focal" ]]; then
34-
docker build --file build/golang-ubuntu/golang-1.23-focal.Dockerfile --tag golang:1.23-focal build/golang-ubuntu
34+
docker build --file build/golang-ubuntu/golang-1.24-focal.Dockerfile --tag golang:1.24-focal build/golang-ubuntu
3535
fi
3636
if [[ $TAG == "ubuntu-jammy" ]]; then
37-
docker build --file build/golang-ubuntu/golang-1.23-jammy.Dockerfile --tag golang:1.23-jammy build/golang-ubuntu
37+
docker build --file build/golang-ubuntu/golang-1.24-jammy.Dockerfile --tag golang:1.24-jammy build/golang-ubuntu
3838
fi
3939
if [[ $TAG == "debian-buster" ]]; then
40-
docker build --file build/golang-debian/golang-1.23-buster.Dockerfile --tag golang:1.23-buster build/golang-debian
40+
docker build --file build/golang-debian/golang-1.24-buster.Dockerfile --tag golang:1.24-buster build/golang-debian
4141
fi
4242

4343
docker build --file build/packages.Dockerfile \

build/packages.Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ COPY statshouse-ui/ ./statshouse-ui/
1313
COPY grafana-plugin-ui/ ./grafana-plugin-ui/
1414
RUN make build-sh-ui build-grafana-ui
1515

16-
FROM golang:1.23-bullseye AS build-go-bullseye
16+
FROM golang:1.24-bullseye AS build-go-bullseye
1717
WORKDIR /src
1818
COPY go.mod go.sum ./
1919
RUN go mod download -x
@@ -39,7 +39,7 @@ RUN --mount=type=bind,src=$GOCACHE,target=/root/.cache/go-build,readwrite \
3939
--mount=type=bind,src=cmd/,target=/src/cmd,readonly \
4040
make build-sh build-sh-metadata build-sh-api build-sh-grafana build-igp build-agg
4141

42-
FROM golang:1.23-bookworm AS build-go-bookworm
42+
FROM golang:1.24-bookworm AS build-go-bookworm
4343
WORKDIR /src
4444
COPY go.mod go.sum ./
4545
RUN go mod download -x
@@ -65,7 +65,7 @@ RUN --mount=type=bind,src=$GOCACHE,target=/root/.cache/go-build,readwrite \
6565
--mount=type=bind,src=cmd/,target=/src/cmd,readonly \
6666
make build-sh build-sh-metadata build-sh-api build-sh-grafana build-igp build-agg
6767

68-
FROM golang:1.23-buster AS build-go-buster
68+
FROM golang:1.24-buster AS build-go-buster
6969
WORKDIR /src
7070
COPY go.mod go.sum ./
7171
RUN go mod download -x
@@ -91,7 +91,7 @@ RUN --mount=type=bind,src=$GOCACHE,target=/root/.cache/go-build,readwrite \
9191
--mount=type=bind,src=cmd/,target=/src/cmd,readonly \
9292
make build-sh build-sh-metadata build-sh-api build-sh-grafana build-igp build-agg
9393

94-
FROM golang:1.23-focal AS build-go-focal
94+
FROM golang:1.24-focal AS build-go-focal
9595
WORKDIR /src
9696
COPY go.mod go.sum ./
9797
RUN go mod download -x
@@ -117,7 +117,7 @@ RUN --mount=type=bind,src=$GOCACHE,target=/root/.cache/go-build,readwrite \
117117
--mount=type=bind,src=cmd/,target=/src/cmd,readonly \
118118
make build-sh build-sh-metadata build-sh-api build-sh-grafana build-igp build-agg
119119

120-
FROM golang:1.23-jammy AS build-go-jammy
120+
FROM golang:1.24-jammy AS build-go-jammy
121121
WORKDIR /src
122122
COPY go.mod go.sum ./
123123
RUN go mod download -x

0 commit comments

Comments
 (0)