From deae0e6ae1a5bb50528589bd3ae16f45a4c10ad9 Mon Sep 17 00:00:00 2001 From: Matt Moyer Date: Tue, 24 Apr 2018 09:51:25 -0500 Subject: [PATCH] Switch to upstream Go build images. These internal `gcr.io/heptio-images/golang` images are deprecated. It looks like `git` and `bash` are the only things the Ark build needed that aren't in the upstream `golang:1.9-alpine3.6` image. Signed-off-by: Matt Moyer --- hack/build-image/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hack/build-image/Dockerfile b/hack/build-image/Dockerfile index 0b2ca257f..b44de3ef4 100644 --- a/hack/build-image/Dockerfile +++ b/hack/build-image/Dockerfile @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM gcr.io/heptio-images/golang:1.9-alpine3.6 +FROM golang:1.9-alpine3.6 -RUN mkdir -p /go/src/k8s.io && \ +RUN apk add --update --no-cache git bash && \ + mkdir -p /go/src/k8s.io && \ cd /go/src/k8s.io && \ git clone -b kubernetes-1.9.0 https://github.com/kubernetes/code-generator && \ git clone -b kubernetes-1.9.0 https://github.com/kubernetes/apimachinery && \