From a08fbb25b3f4821206c8e9fc3d59d37a821a130b Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Tue, 14 Dec 2021 10:07:17 -0500 Subject: [PATCH] [Automation] Update go release version to 1.17.5 (#140) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: apmmachine Co-authored-by: Noémi Ványi --- Jenkinsfile | 2 +- go1.17/Makefile.common | 2 +- go1.17/base-arm/Dockerfile.tmpl | 4 ++-- go1.17/base/Dockerfile.tmpl | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c3a677fd..a79bf782 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,7 @@ pipeline { DOCKER_REGISTRY_SECRET = 'secret/observability-team/ci/docker-registry/prod' REGISTRY = 'docker.elastic.co' STAGING_IMAGE = "${env.REGISTRY}/observability-ci" - GO_VERSION = '1.17.4' + GO_VERSION = '1.17.5' } options { timeout(time: 3, unit: 'HOURS') diff --git a/go1.17/Makefile.common b/go1.17/Makefile.common index 3c6b147c..9a12028c 100644 --- a/go1.17/Makefile.common +++ b/go1.17/Makefile.common @@ -2,7 +2,7 @@ SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST))) include $(SELF_DIR)/../Makefile.common NAME := golang-crossbuild -VERSION := 1.17.4 +VERSION := 1.17.5 DEBIAN_VERSION ?= 9 SUFFIX := -$(shell basename $(CURDIR)) TAG_EXTENSION ?= diff --git a/go1.17/base-arm/Dockerfile.tmpl b/go1.17/base-arm/Dockerfile.tmpl index 51ea4e87..ef010850 100644 --- a/go1.17/base-arm/Dockerfile.tmpl +++ b/go1.17/base-arm/Dockerfile.tmpl @@ -37,9 +37,9 @@ RUN \ libsqlite3-0 \ && rm -rf /var/lib/apt/lists/* -ARG GOLANG_VERSION=1.17.4 +ARG GOLANG_VERSION=1.17.5 ARG GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-arm64.tar.gz -ARG GOLANG_DOWNLOAD_SHA256=617a46bd083e59877bb5680998571b3ddd4f6dcdaf9f8bf65ad4edc8f3eafb13 +ARG GOLANG_DOWNLOAD_SHA256=6f95ce3da40d9ce1355e48f31f4eb6508382415ca4d7413b1e7a3314e6430e7e RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \ && echo "$GOLANG_DOWNLOAD_SHA256 golang.tar.gz" | sha256sum -c - \ diff --git a/go1.17/base/Dockerfile.tmpl b/go1.17/base/Dockerfile.tmpl index 629b874a..100be73e 100644 --- a/go1.17/base/Dockerfile.tmpl +++ b/go1.17/base/Dockerfile.tmpl @@ -29,9 +29,9 @@ RUN apt-get -o Acquire::Check-Valid-Until=false update -y --no-install-recommend RUN ln -s /usr/bin/pip3 /usr/bin/pip {{ end }} -ARG GOLANG_VERSION=1.17.4 +ARG GOLANG_VERSION=1.17.5 ARG GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz -ARG GOLANG_DOWNLOAD_SHA256=adab2483f644e2f8a10ae93122f0018cef525ca48d0b8764dae87cb5f4fd4206 +ARG GOLANG_DOWNLOAD_SHA256=bd78114b0d441b029c8fe0341f4910370925a4d270a6a590668840675b0c653e RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \ && echo "$GOLANG_DOWNLOAD_SHA256 golang.tar.gz" | sha256sum -c - \