From 0a3a9c668fd13855dde6041db63dca90eec00a76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= Date: Mon, 10 May 2021 11:29:36 +0200 Subject: [PATCH] Update Golang version to 1.15.12 (#84) --- Jenkinsfile | 2 +- README.md | 22 +++++++++++----------- go1.15/Makefile.common | 2 +- go1.15/base-arm/Dockerfile.tmpl | 4 ++-- go1.15/base/Dockerfile.tmpl | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1d1b214b..78576711 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.15.10' + GO_VERSION = '1.15.12' } options { timeout(time: 3, unit: 'HOURS') diff --git a/README.md b/README.md index f704fd34..ee4f6a6a 100644 --- a/README.md +++ b/README.md @@ -14,21 +14,21 @@ The base image used is Debian 9 (stretch) unless otherwise specified. ## Build Tags -- `1.10.8-main`, `1.11.13-main`, `1.12.12-main`, `1.13.12-main`, `1.14.15-main`, `1.15.10-main` - linux/{amd64,386} and windows/{amd64,386} -- `1.10.8-arm`, `1.11.13-arm`, `1.12.12-arm`, `1.13.12-arm`, `1.14.15-arm`, `1.15.10-arm` - linux/{armv5,armv6,armv7,arm64} +- `1.10.8-main`, `1.11.13-main`, `1.12.12-main`, `1.13.12-main`, `1.14.15-main`, `1.15.12-main` - linux/{amd64,386} and windows/{amd64,386} +- `1.10.8-arm`, `1.11.13-arm`, `1.12.12-arm`, `1.13.12-arm`, `1.14.15-arm`, `1.15.12-arm` - linux/{armv5,armv6,armv7,arm64} - `1.10.8-darwin`, `1.11.13-darwin`, `1.12.12-darwin`, `1.13.12-darwin`, `1.14.15-darwin` - darwin/{386} -- `1.10.8-darwin`, `1.11.13-darwin`, `1.12.12-darwin`, `1.13.12-darwin`, `1.14.15-darwin`, `1.15.10-darwin` - darwin/{amd64} -- `1.10.8-ppc`, `1.11.13-ppc`, `1.12.12-ppc`, `1.13.12-ppc`, `1.14.15-ppc`, `1.15.10-ppc` - linux/{ppc64,ppc64le} -- `1.10.8-mips`, `1.11.13-mips`, `1.12.12-mips`, `1.13.12-mips`, `1.14.15-mips`, `1.15.10-mips` - linux/{mips,mipsle,mips64,mips64le} -- `1.10.8-s390x`, `1.11.13-s390x`, `1.12.12-s390`, `1.13.12-s390`, `1.14.15-s390`, `1.15.10-s390` - linux/s390x -- `1.10.8-main-debian7`, `1.11.13-main-debian7`, `1.12.12-debian7`, `1.13.12-debian7`, `1.14.15-debian7`, `1.15.10-debian7` - linux/{amd64,386} and windows/{amd64,386} (Debian 7 +- `1.10.8-darwin`, `1.11.13-darwin`, `1.12.12-darwin`, `1.13.12-darwin`, `1.14.15-darwin`, `1.15.12-darwin` - darwin/{amd64} +- `1.10.8-ppc`, `1.11.13-ppc`, `1.12.12-ppc`, `1.13.12-ppc`, `1.14.15-ppc`, `1.15.12-ppc` - linux/{ppc64,ppc64le} +- `1.10.8-mips`, `1.11.13-mips`, `1.12.12-mips`, `1.13.12-mips`, `1.14.15-mips`, `1.15.12-mips` - linux/{mips,mipsle,mips64,mips64le} +- `1.10.8-s390x`, `1.11.13-s390x`, `1.12.12-s390`, `1.13.12-s390`, `1.14.15-s390`, `1.15.12-s390` - linux/s390x +- `1.10.8-main-debian7`, `1.11.13-main-debian7`, `1.12.12-debian7`, `1.13.12-debian7`, `1.14.15-debian7`, `1.15.12-debian7` - linux/{amd64,386} and windows/{amd64,386} (Debian 7 uses glibc 2.13 so the resulting binaries (if dynamically linked) have greater compatibility.) -- `1.10.8-main-debian8`, `1.11.13-main-debian8`, `1.12.12-main-debian8`, `1.13.12-debian8`, `1.14.15-debian8`, `1.15.10-debian8` - linux/{amd64,386} and windows/{amd64,386} (Debian 8 +- `1.10.8-main-debian8`, `1.11.13-main-debian8`, `1.12.12-main-debian8`, `1.13.12-debian8`, `1.14.15-debian8`, `1.15.12-debian8` - linux/{amd64,386} and windows/{amd64,386} (Debian 8 uses glibc 2.19) -- `1.15.10-debian9` - linux/{amd64,386} and windows/{amd64,386} (Debian 9 uses glibc 2.24) -- `1.15.10-base-arm-debian9` - linux/arm64 (Debian 9 uses glibc 2.24) -- `1.15.10-debian10` - linux/{amd64,386} and windows/{amd64,386} (Debian 10 uses glibc 2.28) +- `1.15.12-debian9` - linux/{amd64,386} and windows/{amd64,386} (Debian 9 uses glibc 2.24) +- `1.15.12-base-arm-debian9` - linux/arm64 (Debian 9 uses glibc 2.24) +- `1.15.12-debian10` - linux/{amd64,386} and windows/{amd64,386} (Debian 10 uses glibc 2.28) ## Usage Example diff --git a/go1.15/Makefile.common b/go1.15/Makefile.common index 3d2f8363..1e13e984 100644 --- a/go1.15/Makefile.common +++ b/go1.15/Makefile.common @@ -2,7 +2,7 @@ SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST))) include $(SELF_DIR)/../Makefile.common NAME := golang-crossbuild -VERSION := 1.15.10 +VERSION := 1.15.12 DEBIAN_VERSION ?= 9 SUFFIX := -$(shell basename $(CURDIR)) TAG_EXTENSION ?= diff --git a/go1.15/base-arm/Dockerfile.tmpl b/go1.15/base-arm/Dockerfile.tmpl index d74dd39c..91248f0f 100644 --- a/go1.15/base-arm/Dockerfile.tmpl +++ b/go1.15/base-arm/Dockerfile.tmpl @@ -37,9 +37,9 @@ RUN \ libsqlite3-0 \ && rm -rf /var/lib/apt/lists/* -ARG GOLANG_VERSION=1.15.10 +ARG GOLANG_VERSION=1.15.12 ARG GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-arm64.tar.gz -ARG GOLANG_DOWNLOAD_SHA256=ca3f3e84d863d8e758bfaab65430b12b6cff8f5a5648139245321d3401da64a7 +ARG GOLANG_DOWNLOAD_SHA256=a10161e6f0389c45ecd810e114acaba967ea3a4def551fcbb0b1e270996103ed RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \ && echo "$GOLANG_DOWNLOAD_SHA256 golang.tar.gz" | sha256sum -c - \ diff --git a/go1.15/base/Dockerfile.tmpl b/go1.15/base/Dockerfile.tmpl index ee7b8889..4b269982 100644 --- a/go1.15/base/Dockerfile.tmpl +++ b/go1.15/base/Dockerfile.tmpl @@ -20,9 +20,9 @@ RUN \ bison \ && rm -rf /var/lib/apt/lists/* -ARG GOLANG_VERSION=1.15.10 +ARG GOLANG_VERSION=1.15.12 ARG GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz -ARG GOLANG_DOWNLOAD_SHA256=4aa1267517df32f2bf1cc3d55dfc27d0c6b2c2b0989449c96dd19273ccca051d +ARG GOLANG_DOWNLOAD_SHA256=bbdb935699e0b24d90e2451346da76121b2412d30930eabcd80907c230d098b7 RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \ && echo "$GOLANG_DOWNLOAD_SHA256 golang.tar.gz" | sha256sum -c - \