github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 09:16:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2080 from dave-tucker/pkg-mk

Browse Source 
Simplify Makefiles for Packages
This commit is contained in:
Rolf Neugebauer 2017-06-22 13:35:43 +01:00 committed by GitHub
commit d65bb86c37
24 changed files with 60 additions and 298 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/binfmt/Makefile
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/*)

14
pkg/ca-certificates/Makefile
View File

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

15
pkg/containerd/Makefile
View File

@ -1,15 +1,4 @@
.PHONY: tag push
include ../package.mk
ORG?=linuxkit
IMAGE=containerd
HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
default: push
tag: Dockerfile
docker build -t $(ORG)/$(IMAGE):$(HASH) .
push: tag
DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \
DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH)
NETWORK=1

15
pkg/dhcpcd/Makefile
View File

@ -1,15 +1,4 @@
.PHONY: tag push
default: push
include ../package.mk
ORG?=linuxkit
IMAGE=dhcpcd
DEPS=Dockerfile Makefile dhcpcd.conf usr/lib/dhcpcd/dhcpcd-hooks/10-mtu
HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
tag: $(DEPS)
docker build --squash --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=dhcpcd.conf $(wildcard usr/lib/dhcpcd/dhcpcd-hooks/*)

15
pkg/docker-ce/Makefile
View File

@ -1,15 +1,4 @@
.PHONY: tag push
default: push
include ../package.mk
ORG?=linuxkit
IMAGE=docker-ce
DEPS=Dockerfile
HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
tag: $(DEPS)
docker build --squash --no-cache -t $(ORG)/$(IMAGE):$(HASH) .
push: tag
DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \
DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH)
NETWORK=1

15
pkg/format/Makefile
View File

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

15
pkg/getty/Makefile
View File

@ -1,15 +1,4 @@
.PHONY: tag push
default: push
include ../package.mk
ORG?=linuxkit
IMAGE=getty
DEPS=Dockerfile usr/bin/rungetty.sh
HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
tag: $(DEPS)
docker build --squash --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=usr/bin/rungetty.sh $(wildcard etc/*) $(wildcard etc/init.d/*)

15
pkg/init/Makefile
View File

@ -1,15 +1,4 @@
.PHONY: tag push
default: push
include ../package.mk
ORG?=linuxkit
IMAGE=init
DEPS=Dockerfile init $(wildcard etc/*) $(wildcard etc/init.d/*) usermode-helper.c
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=init usermode-helper.c $(wildcard etc/*) $(wildcard etc/init.d/*)

15
pkg/metadata/Makefile
View File

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

15
pkg/mkimage/Makefile
View File

@ -1,15 +1,4 @@
.PHONY: tag push
default: push
include ../package.mk
ORG?=linuxkit
IMAGE=mkimage
DEPS=Dockerfile mkimage.sh
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=mkimage.sh

15
pkg/mount/Makefile
View File

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

14
pkg/node_exporter/Makefile
View File

@ -1,15 +1,3 @@
.PHONY: tag push
default: push
include ../package.mk
ORG?=linuxkit
IMAGE=node_exporter
DEPS=Dockerfile
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)

14
pkg/open-vm-tools/Makefile
View File

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

15
pkg/openntpd/Makefile
View File

@ -1,15 +1,4 @@
.PHONY: tag push
default: push
include ../package.mk
ORG?=linuxkit
IMAGE=openntpd
DEPS=Dockerfile etc/ntpd.conf
HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
tag: $(DEPS)
docker build --squash --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=etc/ntpd.conf

17
pkg/package.mk Normal file
View File

@ -0,0 +1,17 @@
.PHONY: tag push
default: push
ORG?=linuxkit
HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
BASE_DEPS=Dockerfile Makefile
tag: $(BASE_DEPS) $(DEPS)
ifndef $(NETWORK)
docker build -t $(ORG)/$(IMAGE):$(HASH) .
else
docker build --network=none -t $(ORG)/$(IMAGE):$(HASH) .
endif
push: tag
DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \
DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH)

13
pkg/qemu-ga/Makefile
View File

@ -1,14 +1,3 @@
.PHONY: tag push
include ../package.mk
ORG?=linuxkit
IMAGE=qemu-ga
HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
default: push
tag: Dockerfile
docker build --network=none -t $(ORG)/$(IMAGE):$(HASH) .
push: tag
docker pull $(ORG)/$(IMAGE):$(HASH) || docker push $(ORG)/$(IMAGE):$(HASH)

14
pkg/rngd/Makefile
View File

@ -1,15 +1,3 @@
.PHONY: tag push
default: push
include ../package.mk
ORG?=linuxkit
IMAGE=rngd
DEPS=Dockerfile
HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
tag: $(DEPS)
docker build --squash --no-cache -t $(ORG)/$(IMAGE):$(HASH) .
push: tag
DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \
DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH)

15
pkg/runc/Makefile
View File

@ -1,15 +1,4 @@
.PHONY: tag push
include ../package.mk
ORG?=linuxkit
IMAGE=runc
HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
default: push
tag: Dockerfile
docker build -t $(ORG)/$(IMAGE):$(HASH) .
push: tag
DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \
DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH)
NETWORK=1

15
pkg/sshd/Makefile
View File

@ -1,15 +1,4 @@
.PHONY: tag push
default: push
include ../package.mk
ORG?=linuxkit
IMAGE=sshd
DEPS=Dockerfile etc/motd etc/ssh/sshd_config usr/bin/ssh.sh
HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
tag: $(DEPS)
docker build --squash --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=etc/motd etc/ssh/sshd_config usr/bin/ssh.sh

15
pkg/swap/Makefile
View File

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

15
pkg/sysctl/Makefile
View File

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

15
pkg/sysfs/Makefile
View File

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

16
pkg/vpnkit-forwarder/Makefile
View File

@ -1,15 +1,5 @@
default: push
include ../package.mk
ORG?=linuxkit
IMAGE=vpnkit-forwarder
DEPS=$(wildcard *.go) Makefile Dockerfile
HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
tag: $(DEPS)
docker build --squash --no-cache -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=$(wildcard *.go)
NETWORK=1

16
pkg/vsudd/Makefile
View File

@ -1,15 +1,5 @@
default: push
include ../package.mk
ORG?=linuxkit
IMAGE=vsudd
DEPS=$(wildcard *.go) Makefile Dockerfile
HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
tag: $(DEPS)
docker build --squash --no-cache -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=$(wildcard *.go)
NETWORK=1