Merge branch 'master' into feats/release-go-1.16

elastic · May 10, 2021 · 17e4e31 · 17e4e31
2 parents 487b442 + 0a3a9c6
commit 17e4e31
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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 - \