From 857d1fbb3b94a6e37110ee17d548b83724d21bc4 Mon Sep 17 00:00:00 2001 From: Matt Moyer Date: Tue, 24 Apr 2018 10:20:02 -0500 Subject: [PATCH] Switch to upstream Go build images. (#419) These internal `gcr.io/heptio-images/golang` images are deprecated. It looks like `bash` was the only thing that the Sonobuoy runtime image needed that wasn't in the upstream `golang:1.9-alpine3.6` image. Signed-off-by: Matt Moyer --- Dockerfile | 4 ++-- Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index aa9e84bc3..b3966eaea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,10 +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 MAINTAINER Timothy St. Clair "tstclair@heptio.com" -RUN apk add --no-cache ca-certificates +RUN apk add --no-cache ca-certificates bash ADD sonobuoy /sonobuoy ADD scripts/run_master.sh /run_master.sh ADD scripts/run_single_node_worker.sh /run_single_node_worker.sh diff --git a/Makefile b/Makefile index 095320eab..e8d8eea2d 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ ifneq ($(VERBOSE),) VERBOSE_FLAG = -v endif BUILDMNT = /go/src/$(GOTARGET) -BUILD_IMAGE ?= gcr.io/heptio-images/golang:1.9-alpine3.6 +BUILD_IMAGE ?= golang:1.9-alpine3.6 BUILDCMD = go build -o $(TARGET) $(VERBOSE_FLAG) -ldflags "-X github.com/heptio/sonobuoy/pkg/buildinfo.Version=$(GIT_VERSION)" BUILD = $(BUILDCMD) $(GOTARGET)