diff --git a/go1.13/Makefile b/go1.13/Makefile index 12f52c8b..1eaccd57 100644 --- a/go1.13/Makefile +++ b/go1.13/Makefile @@ -1,4 +1,5 @@ -IMAGES := base main darwin arm mips ppc s390x +# mips ppc s390x are temporarily disabled. See: https://github.com/elastic/golang-crossbuild/issues/71 +IMAGES := base main darwin arm build: @$(foreach var,$(IMAGES),$(MAKE) -C $(var) build || exit 1;) diff --git a/go1.14/Makefile b/go1.14/Makefile index 12f52c8b..1eaccd57 100644 --- a/go1.14/Makefile +++ b/go1.14/Makefile @@ -1,4 +1,5 @@ -IMAGES := base main darwin arm mips ppc s390x +# mips ppc s390x are temporarily disabled. See: https://github.com/elastic/golang-crossbuild/issues/71 +IMAGES := base main darwin arm build: @$(foreach var,$(IMAGES),$(MAKE) -C $(var) build || exit 1;) diff --git a/go1.14/Makefile.common b/go1.14/Makefile.common index 7525d209..9484d7a5 100644 --- a/go1.14/Makefile.common +++ b/go1.14/Makefile.common @@ -2,7 +2,7 @@ SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST))) include $(SELF_DIR)/../Makefile.common NAME := golang-crossbuild -VERSION := 1.14.7 +VERSION := 1.14.12 DEBIAN_VERSION ?= 9 SUFFIX := -$(shell basename $(CURDIR)) TAG_EXTENSION ?= diff --git a/go1.14/base/Dockerfile.tmpl b/go1.14/base/Dockerfile.tmpl index 6406e571..48bb5216 100644 --- a/go1.14/base/Dockerfile.tmpl +++ b/go1.14/base/Dockerfile.tmpl @@ -21,9 +21,9 @@ RUN \ bison \ && rm -rf /var/lib/apt/lists/* -ARG GOLANG_VERSION=1.14.7 +ARG GOLANG_VERSION=1.14.12 ARG GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz -ARG GOLANG_DOWNLOAD_SHA256=4a7fa60f323ee1416a4b1425aefc37ea359e9d64df19c326a58953a97ad41ea5 +ARG GOLANG_DOWNLOAD_SHA256=fb26f951c88c0685d7df393611189c58e6eabd3c17bdaef37df11355ab8db9d3 RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \ && echo "$GOLANG_DOWNLOAD_SHA256 golang.tar.gz" | sha256sum -c - \