From 9797d6fc5225cf43dab9376f67c2be77b1d8d0de Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Fri, 20 Oct 2017 14:12:54 -0700 Subject: [PATCH] Update to multi-arch image for golang golang:1.8.4-alpine does not have multi-arch images available in the manifest. (s390x, ppc64le, etc.) This makes it so that if you are trying to compile on different arches you aren't forced to have to write your own Dockerfile and can instead use the one bundled with the CLI repo. Signed-off-by: Eli Uriegas Upstream-commit: 9d1d9f2fa3220ffbe038a393a757b78266c64178 Component: cli --- components/cli/dockerfiles/Dockerfile.dev | 2 +- components/cli/dockerfiles/Dockerfile.lint | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/cli/dockerfiles/Dockerfile.dev b/components/cli/dockerfiles/Dockerfile.dev index 1651ad1eb0..aff06bc2cd 100644 --- a/components/cli/dockerfiles/Dockerfile.dev +++ b/components/cli/dockerfiles/Dockerfile.dev @@ -1,5 +1,5 @@ -FROM golang:1.8.4-alpine +FROM golang:1.8.4-alpine3.6 RUN apk add -U git make bash coreutils ca-certificates diff --git a/components/cli/dockerfiles/Dockerfile.lint b/components/cli/dockerfiles/Dockerfile.lint index 75ca90c494..b2b347594e 100644 --- a/components/cli/dockerfiles/Dockerfile.lint +++ b/components/cli/dockerfiles/Dockerfile.lint @@ -1,4 +1,4 @@ -FROM golang:1.8.4-alpine +FROM golang:1.8.4-alpine3.6 RUN apk add -U git