Simplify Makefiles for Packages

These now inherit from a top-level package.mk
Options like use of the network can be enabled on a per package basis
This removes a lot of duplicate code and make the maintenace of these
Makefiles much easier

Signed-off-by: Dave Tucker <dt@docker.com>
This commit is contained in:
Dave Tucker
2017-06-20 12:06:58 +01:00
parent b69bcec0e9
commit adae27b8d1
24 changed files with 60 additions and 298 deletions

View File

@@ -1,15 +1,4 @@
.PHONY: tag push
default: push
include ../package.mk
ORG?=linuxkit
IMAGE=binfmt
DEPS=Dockerfile Makefile main.go $(wildcard etc/binmft.d/*)
HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
tag: $(DEPS)
docker build --no-cache --network=none -t $(ORG)/$(IMAGE):$(HASH) .
push: tag
DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \
DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH)
DEPS=main.go $(wildcard etc/binmft.d/*)