Skip to content

Commit a20e3ab

Browse files
authored
Update to Go 1.23.0 (#436)
1 parent e40765c commit a20e3ab

File tree

8 files changed

+32
-26
lines changed

8 files changed

+32
-26
lines changed

.github/updatecli.d/bump-go-release-version.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,3 @@ find "go" -type f -name Dockerfile.tmpl -print0 |
4545
${SED} -E -e "s#(ARG GOLANG_DOWNLOAD_SHA256)=.+#\1=${GOLANG_DOWNLOAD_SHA256_AMD}#g" "$line"
4646
fi
4747
done
48-
49-
if [ -e go/base/install-go.sh ] ; then
50-
${SED} -E -e "s#(GOLANG_VERSION)=[0-9]+\.[0-9]+(\.[0-9]+)?#\1=${GO_RELEASE_VERSION}#g" go/base/install-go.sh
51-
${SED} -E -e "s#(GOLANG_DOWNLOAD_SHA256_AMD)=.+#\1=${GOLANG_DOWNLOAD_SHA256_AMD}#g" go/base/install-go.sh
52-
${SED} -E -e "s#(GOLANG_DOWNLOAD_SHA256_ARM)=.+#\1=${GOLANG_DOWNLOAD_SHA256_ARM}#g" go/base/install-go.sh
53-
fi

.github/workflows/bump-golang.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
with:
2222
branch: 'main'
2323
# NOTE: when a new golang version please update me with 1.<go-version>
24-
go-minor: '1.22'
24+
go-minor: '1.23'
2525
command: '--experimental apply'
2626
slack-bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
2727
github-token: ${{ secrets.GITHUB_TOKEN }}

.go-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.22.6
1+
1.23.0

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,7 @@ In the folder you can find the `sources.list` file that contains the list of rep
276276
this file is different for each Debian version. In some cases, this file must point to `http://archive.debian.org/debian` instead of `http://deb.debian.org/debian` to be able to install the packages, this happens when the Debian version reach the end of life.
277277

278278
The base image is the one that install the `go` compiler, and the build tools for the rest of Docker images.
279-
There is a scrip `install-go.sh` that download, check the SHA256, and install the `go` compiler, during the build of the Docker image.
280-
When a new version of go i released, the `install-go.sh` script must be updated to install the new version.
279+
When a new version of go is released, the aDockerimage.tmpla files must be updated to install the new version.
281280

282281
## go/base-arm Docker image
283282

go/Makefile.common

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
22
include $(SELF_DIR)/../Makefile.common
33

44
NAME := golang-crossbuild
5-
VERSION := 1.22.6
5+
VERSION := 1.23.0
66
DEBIAN_VERSION ?= 9
77
SUFFIX := -$(shell basename $(CURDIR))
88
TAG_EXTENSION ?=

go/base-arm/Dockerfile.tmpl

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,18 @@ RUN \
3737
libsqlite3-0 \
3838
&& rm -rf /var/lib/apt/lists/*
3939

40-
ARG GOLANG_VERSION=1.22.6
40+
ARG GOLANG_VERSION=1.23.0
4141
ARG GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-arm64.tar.gz
42-
ARG GOLANG_DOWNLOAD_SHA256=c15fa895341b8eaf7f219fada25c36a610eb042985dc1a912410c1c90098eaf2
42+
ARG GOLANG_DOWNLOAD_SHA256=62788056693009bcf7020eedc778cdd1781941c6145eab7688bd087bce0f8659
4343

4444
RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \
4545
&& echo "$GOLANG_DOWNLOAD_SHA256 golang.tar.gz" | sha256sum -c - \
46+
&& rm -rf /usr/local/go \
4647
&& tar -C /usr/local -xzf golang.tar.gz \
4748
&& rm golang.tar.gz
4849

4950
ENV GOPATH /go
50-
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
51+
ENV PATH $PATH:/usr/local/go/bin
5152

5253
RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
5354
WORKDIR $GOPATH
@@ -58,8 +59,12 @@ COPY rootfs /
5859
RUN ldd --version
5960

6061
WORKDIR /
62+
63+
RUN mkdir -p /root/.config/go/telemetry && echo "off 2024-08-23" > /root/.config/go/telemetry/mode
6164
RUN go mod init github.com/elastic/golang-crossbuild-$GOLANG_VERSION-arm \
62-
&& go get -d . \
65+
&& go get . \
66+
&& go env \
67+
&& echo "toolcompile=$(go tool compile -V)" \
6368
&& go build -o /crossbuild /entrypoint.go \
6469
&& rm -rf /go/* /root/.cache/* /entrypoint.go
6570

go/base/Dockerfile.tmpl

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,18 @@ RUN apt-get -o Acquire::Check-Valid-Until=false update -y --no-install-recommend
3131
RUN ln -s /usr/bin/pip3 /usr/bin/pip
3232
{{- end }}
3333

34-
COPY install-go.sh /tmp/install-go.sh
35-
RUN chmod ugo+rx /tmp/install-go.sh \
36-
&& /tmp/install-go.sh \
37-
&& rm /tmp/install-go.sh
34+
ARG GOLANG_VERSION=1.23.0
35+
ARG GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
36+
ARG GOLANG_DOWNLOAD_SHA256=905a297f19ead44780548933e0ff1a1b86e8327bb459e92f9c0012569f76f5e3
37+
38+
RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \
39+
&& echo "$GOLANG_DOWNLOAD_SHA256 golang.tar.gz" | sha256sum -c - \
40+
&& rm -rf /usr/local/go \
41+
&& tar -C /usr/local -xzf golang.tar.gz \
42+
&& rm golang.tar.gz
3843

3944
ENV GOPATH /go
40-
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
45+
ENV PATH $PATH:/usr/local/go/bin
4146

4247
RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
4348
WORKDIR $GOPATH
@@ -48,9 +53,12 @@ COPY rootfs /
4853
RUN ldd --version
4954

5055
WORKDIR /
56+
RUN mkdir -p /root/.config/go/telemetry && echo "off 2024-08-23" > /root/.config/go/telemetry/mode
5157
RUN go mod init github.com/elastic/golang-crossbuild-$GOLANG_VERSION \
52-
&& go get -d . \
53-
&& go build -o /crossbuild /entrypoint.go \
58+
&& go get . \
59+
&& go env \
60+
&& echo "toolcompile=$(go tool compile -V)" \
61+
&& CGO_ENABLED=0 go build -o /crossbuild /entrypoint.go \
5462
&& rm -rf /go/* /root/.cache/* /entrypoint.go
5563

5664
RUN curl -sSLO https://storage.googleapis.com/obs-ci-cache/beats/libpcap-1.8.1.tar.gz \

go/base/install-go.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# This script install the Go version correct for each architecture.
33
set -e
44

5-
GOLANG_VERSION=1.22.6
5+
GOLANG_VERSION=1.23.0
66
GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
7-
GOLANG_DOWNLOAD_SHA256_AMD=999805bed7d9039ec3da1a53bfbcafc13e367da52aa823cb60b68ba22d44c616
8-
GOLANG_DOWNLOAD_SHA256_ARM=c15fa895341b8eaf7f219fada25c36a610eb042985dc1a912410c1c90098eaf2
7+
GOLANG_DOWNLOAD_SHA256_AMD=905a297f19ead44780548933e0ff1a1b86e8327bb459e92f9c0012569f76f5e3
8+
GOLANG_DOWNLOAD_SHA256_ARM=62788056693009bcf7020eedc778cdd1781941c6145eab7688bd087bce0f8659
99

1010
GO_TAR_FILE=/tmp/golang.tar.gz
1111

@@ -21,5 +21,5 @@ if [ "$(uname -m)" != "x86_64" ]; then
2121
echo "$GOLANG_DOWNLOAD_SHA256_ARM ${GO_TAR_FILE}" | sha256sum -c -
2222
fi
2323

24-
tar -C /usr/local -xzf "${GO_TAR_FILE}"
24+
rm -rf /usr/local/go && tar -C /usr/local -xzf "${GO_TAR_FILE}"
2525
rm "${GO_TAR_FILE}"

0 commit comments

Comments
 (0)