diff --git a/Jenkinsfile b/Jenkinsfile index 1f8015aa..d2c21613 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,7 +29,7 @@ pipeline { DOCKER_REGISTRY_SECRET = 'secret/observability-team/ci/docker-registry/prod' DOCKER_REGISTRY = 'docker.elastic.co' STAGING_IMAGE = "${env.DOCKER_REGISTRY}/observability-ci" - GO_VERSION = '1.20.5' + GO_VERSION = '1.20.6' BUILDX = "1" } options { diff --git a/go/Makefile.common b/go/Makefile.common index 58b0b15d..772c51fb 100644 --- a/go/Makefile.common +++ b/go/Makefile.common @@ -2,7 +2,7 @@ SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST))) include $(SELF_DIR)/../Makefile.common NAME := golang-crossbuild -VERSION := 1.20.5 +VERSION := 1.20.6 DEBIAN_VERSION ?= 9 SUFFIX := -$(shell basename $(CURDIR)) TAG_EXTENSION ?= diff --git a/go/base-arm/Dockerfile.tmpl b/go/base-arm/Dockerfile.tmpl index 39ace6ab..4ae98d6d 100644 --- a/go/base-arm/Dockerfile.tmpl +++ b/go/base-arm/Dockerfile.tmpl @@ -37,9 +37,9 @@ RUN \ libsqlite3-0 \ && rm -rf /var/lib/apt/lists/* -ARG GOLANG_VERSION=1.20.5 +ARG GOLANG_VERSION=1.20.6 ARG GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-arm64.tar.gz -ARG GOLANG_DOWNLOAD_SHA256=aa2fab0a7da20213ff975fa7876a66d47b48351558d98851b87d1cfef4360d09 +ARG GOLANG_DOWNLOAD_SHA256=4e15ab37556e979181a1a1cc60f6d796932223a0f5351d7c83768b356f84429b RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \ && echo "$GOLANG_DOWNLOAD_SHA256 golang.tar.gz" | sha256sum -c - \ diff --git a/go/base/install-go.sh b/go/base/install-go.sh index ccb04f31..a06af39c 100644 --- a/go/base/install-go.sh +++ b/go/base/install-go.sh @@ -2,10 +2,10 @@ # This script install the Go version correct for each architecture. set -e -GOLANG_VERSION=1.20.5 +GOLANG_VERSION=1.20.6 GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz -GOLANG_DOWNLOAD_SHA256_AMD=d7ec48cde0d3d2be2c69203bc3e0a44de8660b9c09a6e85c4732a3f7dc442612 -GOLANG_DOWNLOAD_SHA256_ARM=aa2fab0a7da20213ff975fa7876a66d47b48351558d98851b87d1cfef4360d09 +GOLANG_DOWNLOAD_SHA256_AMD=b945ae2bb5db01a0fb4786afde64e6fbab50b67f6fa0eb6cfa4924f16a7ff1eb +GOLANG_DOWNLOAD_SHA256_ARM=4e15ab37556e979181a1a1cc60f6d796932223a0f5351d7c83768b356f84429b GO_TAR_FILE=/tmp/golang.tar.gz