From bd702ebcf6917fcc60907b4fc807692686da30cd Mon Sep 17 00:00:00 2001 From: Michel Laterman <82832767+michel-laterman@users.noreply.github.com> Date: Tue, 11 May 2021 11:33:34 -0700 Subject: [PATCH] Update golang 1.16.x to latest patch version (#86) --- Jenkinsfile | 2 +- README.md | 24 ++++++++++++------------ go1.16/Makefile.common | 2 +- go1.16/base-arm/Dockerfile.tmpl | 4 ++-- go1.16/base/Dockerfile.tmpl | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5270f97a..f0e0947d 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.16.3' + GO_VERSION = '1.16.4' } options { timeout(time: 3, unit: 'HOURS') diff --git a/README.md b/README.md index a9e14cc6..427dd1c0 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`, `1.16.3-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`, `1.16.3-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`, `1.16.3-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`, `1.16.3-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`, `1.16.3-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`, `1.16.3-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`, `1.16.3-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`, `1.16.3-debian7` - linux/{amd64,386} and windows/{amd64,386} (Debian 7 +- `1.10.8-main`, `1.11.13-main`, `1.12.12-main`, `1.13.12-main`, `1.14.15-main`, `1.15.10-main`, `1.16.4-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`, `1.16.4-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`, `1.16.4-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`, `1.16.4-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`, `1.16.4-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`, `1.16.4-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`, `1.16.4-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`, `1.16.4-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`, `1.16.3-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.10-debian8`, `1.16.4-debian8` - linux/{amd64,386} and windows/{amd64,386} (Debian 8 uses glibc 2.19) -- `1.15.10-debian9`, `1.16.3-debian9` - linux/{amd64,386} and windows/{amd64,386} (Debian 9 uses glibc 2.24) -- `1.15.10-base-arm-debian9`, `1.16.3-base-arm-debian9` - linux/arm64 (Debian 9 uses glibc 2.24) -- `1.15.10-debian10`, `1.16.3-debian10` - linux/{amd64,386} and windows/{amd64,386} (Debian 10 uses glibc 2.28) +- `1.15.10-debian9`, `1.16.4-debian9` - linux/{amd64,386} and windows/{amd64,386} (Debian 9 uses glibc 2.24) +- `1.15.10-base-arm-debian9`, `1.16.4-base-arm-debian9` - linux/arm64 (Debian 9 uses glibc 2.24) +- `1.15.10-debian10`, `1.16.4-debian10` - linux/{amd64,386} and windows/{amd64,386} (Debian 10 uses glibc 2.28) ## Usage Example diff --git a/go1.16/Makefile.common b/go1.16/Makefile.common index af16bb22..ab019db3 100644 --- a/go1.16/Makefile.common +++ b/go1.16/Makefile.common @@ -2,7 +2,7 @@ SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST))) include $(SELF_DIR)/../Makefile.common NAME := golang-crossbuild -VERSION := 1.16.3 +VERSION := 1.16.4 DEBIAN_VERSION ?= 9 SUFFIX := -$(shell basename $(CURDIR)) TAG_EXTENSION ?= diff --git a/go1.16/base-arm/Dockerfile.tmpl b/go1.16/base-arm/Dockerfile.tmpl index d3f895ae..8a4983ae 100644 --- a/go1.16/base-arm/Dockerfile.tmpl +++ b/go1.16/base-arm/Dockerfile.tmpl @@ -37,9 +37,9 @@ RUN \ libsqlite3-0 \ && rm -rf /var/lib/apt/lists/* -ARG GOLANG_VERSION=1.16.3 +ARG GOLANG_VERSION=1.16.4 ARG GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-arm64.tar.gz -ARG GOLANG_DOWNLOAD_SHA256=566b1d6f17d2bc4ad5f81486f0df44f3088c3ed47a3bec4099d8ed9939e90d5d +ARG GOLANG_DOWNLOAD_SHA256=8b18eb05ddda2652d69ab1b1dd1f40dd731799f43c6a58b512ad01ae5b5bba21 RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \ && echo "$GOLANG_DOWNLOAD_SHA256 golang.tar.gz" | sha256sum -c - \ diff --git a/go1.16/base/Dockerfile.tmpl b/go1.16/base/Dockerfile.tmpl index 31aa0ac5..f2a55d56 100644 --- a/go1.16/base/Dockerfile.tmpl +++ b/go1.16/base/Dockerfile.tmpl @@ -20,9 +20,9 @@ RUN \ bison \ && rm -rf /var/lib/apt/lists/* -ARG GOLANG_VERSION=1.16.3 +ARG GOLANG_VERSION=1.16.4 ARG GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz -ARG GOLANG_DOWNLOAD_SHA256=951a3c7c6ce4e56ad883f97d9db74d3d6d80d5fec77455c6ada6c1f7ac4776d2 +ARG GOLANG_DOWNLOAD_SHA256=7154e88f5a8047aad4b80ebace58a059e36e7e2e4eb3b383127a28c711b4ff59 RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \ && echo "$GOLANG_DOWNLOAD_SHA256 golang.tar.gz" | sha256sum -c - \