From 0e6d7d150fb3f865b56be0ec1457fc95cfca196c Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Tue, 17 Jan 2017 13:36:09 +0000 Subject: [PATCH] Use hash for sha image, otherwise requires network access for build Signed-off-by: Justin Cormack --- alpine/base/binfmt/Makefile | 4 ++-- alpine/base/rngd/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/alpine/base/binfmt/Makefile b/alpine/base/binfmt/Makefile index 7cb9e5dfb..1228cbafb 100644 --- a/alpine/base/binfmt/Makefile +++ b/alpine/base/binfmt/Makefile @@ -7,7 +7,8 @@ QEMU_BINARIES=$(addprefix usr/bin/,$(QEMU_FILES)) GO_COMPILE=mobylinux/go-compile@sha256:badfd8a1730ab6e640682d0f95a8f9c51f3cd4b2e8db261fe1a1fd8c6f60bd6e BINFMT_BINARY=usr/bin/binfmt -SHA_IMAGE=alpine:3.5 +# Tag: alpine:3.5 +SHA_IMAGE=alpine@sha256:dfbd4a3a8ebca874ebd2474f044a0b33600d4523d03b0df76e5c5986cb02d7e8 IMAGE=binfmt @@ -32,7 +33,6 @@ container: Dockerfile $(DEPS) tar cf - $^ | docker build --no-cache -t $(IMAGE):build - hash: Dockerfile $(DEPS) - DOCKER_CONTENT_TRUST=1 docker pull $(SHA_IMAGE) tar cf - $^ | docker run --rm -i $(SHA_IMAGE) sha1sum - | sed 's/ .*//' > hash push: hash container diff --git a/alpine/base/rngd/Makefile b/alpine/base/rngd/Makefile index e28873cfb..55ce72f31 100644 --- a/alpine/base/rngd/Makefile +++ b/alpine/base/rngd/Makefile @@ -17,7 +17,8 @@ $(RNGD_BINARY): mkdir -p $(dir $@) docker run --rm --net=none $(RNG_TOOLS_IMAGE) tar cf - $@ | tar xf - -SHA_IMAGE=alpine:3.5 +# Tag: alpine:3.5 +SHA_IMAGE=alpine@sha256:dfbd4a3a8ebca874ebd2474f044a0b33600d4523d03b0df76e5c5986cb02d7e8 IMAGE=rngd @@ -31,7 +32,6 @@ container: Dockerfile $(DEPS) tar cf - $^ | docker build --no-cache -t $(IMAGE):build - hash: Dockerfile $(DEPS) - DOCKER_CONTENT_TRUST=1 docker pull $(SHA_IMAGE) tar cf - $^ | docker run --rm -i $(SHA_IMAGE) sha1sum - | sed 's/ .*//' > hash push: hash container