From b9d77945f3fe76c336e0fae86385a8ad64a9520d Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Sun, 16 Oct 2016 13:42:55 +0100 Subject: [PATCH 1/2] fix hash calculation for Go build container Signed-off-by: Justin Cormack --- alpine/base/alpine-build-go/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/base/alpine-build-go/Makefile b/alpine/base/alpine-build-go/Makefile index 5d74fe87c..b2d7495cb 100644 --- a/alpine/base/alpine-build-go/Makefile +++ b/alpine/base/alpine-build-go/Makefile @@ -8,7 +8,7 @@ default: push hash: docker pull $(BASE) tar cf - Dockerfile | docker build --no-cache -t $(IMAGE):build - - docker run golang:alpine sh -c 'cat /usr/local/go/bin/go /lib/apk/db/installed | sha1sum' | sed 's/ .*//' > hash + docker run $(IMAGE):build sh -c 'cat /usr/local/go/bin/go /lib/apk/db/installed | sha1sum' | sed 's/ .*//' > hash push: hash docker pull mobylinux/$(IMAGE):$(shell cat hash) || \ From db0376cb8845f301d880364d1b444c0b73d752cb Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Sun, 16 Oct 2016 13:48:20 +0100 Subject: [PATCH 2/2] add git to Go build package Signed-off-by: Justin Cormack --- alpine/base/alpine-build-go/Dockerfile | 2 +- alpine/packages/diagnostics/Dockerfile | 2 +- alpine/packages/proxy/Dockerfile | 2 +- alpine/packages/vsudd/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/alpine/base/alpine-build-go/Dockerfile b/alpine/base/alpine-build-go/Dockerfile index 641752a6d..18f035dc9 100644 --- a/alpine/base/alpine-build-go/Dockerfile +++ b/alpine/base/alpine-build-go/Dockerfile @@ -1,2 +1,2 @@ FROM golang:1.7-alpine -RUN apk update && apk add build-base +RUN apk update && apk add --no-cache build-base git diff --git a/alpine/packages/diagnostics/Dockerfile b/alpine/packages/diagnostics/Dockerfile index 1f4fc4954..c92fd1072 100644 --- a/alpine/packages/diagnostics/Dockerfile +++ b/alpine/packages/diagnostics/Dockerfile @@ -1,4 +1,4 @@ -FROM mobylinux/alpine-build-go:e3d97551827fd2ea70b8c484615e85986d4e77fc +FROM mobylinux/alpine-build-go:e726e12b5eea95a4e7aa537e416139d52040c68b COPY ./ /go/src/diagnostics-server/ diff --git a/alpine/packages/proxy/Dockerfile b/alpine/packages/proxy/Dockerfile index 8ab51cf72..a13958445 100644 --- a/alpine/packages/proxy/Dockerfile +++ b/alpine/packages/proxy/Dockerfile @@ -1,4 +1,4 @@ -FROM mobylinux/alpine-build-go:e3d97551827fd2ea70b8c484615e85986d4e77fc +FROM mobylinux/alpine-build-go:e726e12b5eea95a4e7aa537e416139d52040c68b COPY ./ /go/src/proxy/ diff --git a/alpine/packages/vsudd/Dockerfile b/alpine/packages/vsudd/Dockerfile index 7a7ca6950..5b1a8fa0a 100644 --- a/alpine/packages/vsudd/Dockerfile +++ b/alpine/packages/vsudd/Dockerfile @@ -1,4 +1,4 @@ -FROM mobylinux/alpine-build-go:e3d97551827fd2ea70b8c484615e85986d4e77fc +FROM mobylinux/alpine-build-go:e726e12b5eea95a4e7aa537e416139d52040c68b COPY ./ /go/src/vsudd/