From da16e413c1c5ab90ae9ddd319b5cb4d569e9cf38 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Sat, 16 Mar 2019 07:35:55 -0400 Subject: [PATCH 1/2] Move to golang 1.12.1 official image We used 1.12.0 + hack to download 1.12.1 binaries as we were in a rush on friday since the images were not published at that time. Let's remove the hack now and republish the kube-cross image Change-Id: I3ffff3283b6ca755320adfca3c8f4a36dc1c2b9e --- build/build-image/cross/Dockerfile | 46 +----------------------------- 1 file changed, 1 insertion(+), 45 deletions(-) diff --git a/build/build-image/cross/Dockerfile b/build/build-image/cross/Dockerfile index e080c38bb4..b0cd8ed3fe 100644 --- a/build/build-image/cross/Dockerfile +++ b/build/build-image/cross/Dockerfile @@ -15,51 +15,7 @@ # This file creates a standard build environment for building cross # platform go binary for the architecture kubernetes cares about. -FROM golang:1.12.0 - -################################################################################ -# this is from the upstream golang image source so we can get go1.2.1 -# https://github.com/docker-library/golang/blob/fd272b2b72db82a0bd516ce3d09bba624651516c/1.12/stretch/Dockerfile#L12-L44 -# TODO(bentheelder): remove this block -################################################################################ - -ENV GOLANG_VERSION 1.12.1 - -RUN set -eux; \ - \ -# this "case" statement is generated via "update.sh" - dpkgArch="$(dpkg --print-architecture)"; \ - case "${dpkgArch##*-}" in \ - amd64) goRelArch='linux-amd64'; goRelSha256='2a3fdabf665496a0db5f41ec6af7a9b15a49fbe71a85a50ca38b1f13a103aeec' ;; \ - armhf) goRelArch='linux-armv6l'; goRelSha256='ceac33f07f8fdbccd6c6f7339db33479e1be8c206e67458ba259470fe796dbf2' ;; \ - arm64) goRelArch='linux-arm64'; goRelSha256='10dba44cf95c7aa7abc3c72610c12ebcaf7cad6eed761d5ad92736ca3bc0d547' ;; \ - i386) goRelArch='linux-386'; goRelSha256='af74b6572dd0c133e5de121928616eab60a6252c66f6d9b15007c82207416a2c' ;; \ - ppc64el) goRelArch='linux-ppc64le'; goRelSha256='e1258c81f420c88339abf40888423904c0023497b4e9bbffac9ee484597a57d3' ;; \ - s390x) goRelArch='linux-s390x'; goRelSha256='a9b8f49be6b2083e2586c2ce8a2a86d5dbf47cca64ac6195546a81c9927f9513' ;; \ - *) goRelArch='src'; goRelSha256='0be127684df4b842a64e58093154f9d15422f1405f1fcff4b2c36ffc6a15818a'; \ - echo >&2; echo >&2 "warning: current architecture ($dpkgArch) does not have a corresponding Go binary release; will be building from source"; echo >&2 ;; \ - esac; \ - \ - url="https://golang.org/dl/go${GOLANG_VERSION}.${goRelArch}.tar.gz"; \ - wget -O go.tgz "$url"; \ - echo "${goRelSha256} *go.tgz" | sha256sum -c -; \ - tar -C /usr/local -xzf go.tgz; \ - rm go.tgz; \ - \ - if [ "$goRelArch" = 'src' ]; then \ - echo >&2; \ - echo >&2 'error: UNIMPLEMENTED'; \ - echo >&2 'TODO install golang-any from jessie-backports for GOROOT_BOOTSTRAP (and uninstall after build)'; \ - echo >&2; \ - exit 1; \ - fi; \ - \ - export PATH="/usr/local/go/bin:$PATH"; \ - go version - -################################################################################ -# below is our usual sources -################################################################################ +FROM golang:1.12.1 ENV GOARM 7 ENV KUBE_DYNAMIC_CROSSPLATFORMS \ From 52bb829b20ee6729c09215d1d9c8ab94358c8ca5 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Mon, 18 Mar 2019 15:51:19 -0400 Subject: [PATCH 2/2] Bump kube-cross image to 1.12.1-2 --- build/build-image/cross/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index fe09c70c82..c167785a48 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.12.1-1 +v1.12.1-2