tests/pkg: Update remaining builds to pkg/package.mk

Also update the base tools/alpine to latest.

Signed-off-by: Ian Campbell <ijc@docker.com>
This commit is contained in:
Ian Campbell
2017-07-26 12:21:56 +01:00
parent 37de9c8c1d
commit acbe38d8a1
9 changed files with 19 additions and 67 deletions

View File

@@ -1,4 +1,4 @@
FROM linuxkit/alpine:9bcf61f605ef0ce36cc94d59b8eac307862de6e1 AS mirror
FROM linuxkit/alpine:34af9cb1990debd17fae6d4198c62ce3910d9908 AS mirror
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
RUN apk add --no-cache --initdb -p /out alpine-baselayout busybox musl
RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache

View File

@@ -1,15 +1,5 @@
.PHONY: tag push
default: push
ORG?=linuxkit
IMAGE=poweroff
DEPS=Dockerfile Makefile poweroff.sh
DEPS=poweroff.sh
HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
include ../../../pkg/package.mk
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)