github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-09-20 08:12:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2571 from ijc/linuxkit-pkg

Browse Source 
Implement package build, push and show-tag in linuxkit tool
This commit is contained in:
Justin Cormack
2017-10-09 13:59:02 +01:00
committed by GitHub
parent 74e9dddb21 2f10af2bf3
commit d0882b9674
67 changed files with 16522 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/Makefile
View File

@@ -1,6 +1,10 @@
DIRS = $(shell find . -maxdepth 1 -mindepth 1 -type d)
.PHONY: clean dirs $(DIRS)
# TODO(ijc) once all switch to `linuxkit pkg` update this to:
# linuxkit pkg <build|push> [--force] $$d
# linuxkit pkg show-tag $$d
push:
@set -e; for d in $(DIRS); do make -C "$$d"; done

18
pkg/auditd/Makefile
View File

@@ -1,4 +1,16 @@
IMAGE?=auditd
NETWORK=1
.PHONY: push forcepush tag forcetag show-tag
include ../package.mk
push:
linuxkit pkg push .
forcepush:
linuxkit pkg push --force .
tag:
linuxkit pkg build .
forcetag:
linuxkit pkg build --force .
show-tag:
linuxkit pkg show-tag .

2
pkg/auditd/build.yml Normal file
View File

@@ -0,0 +1,2 @@
image: auditd
network: true

19
pkg/binfmt/Makefile
View File

@@ -1,5 +1,16 @@
IMAGE=binfmt
DEPS=main.go $(wildcard etc/binmft.d/*)
ARCHES=x86_64
.PHONY: push forcepush tag forcetag show-tag
include ../package.mk
push:
linuxkit pkg push .
forcepush:
linuxkit pkg push --force .
tag:
linuxkit pkg build .
forcetag:
linuxkit pkg build --force .
show-tag:
linuxkit pkg show-tag .

3
pkg/binfmt/build.yml Normal file
View File

@@ -0,0 +1,3 @@
image: binfmt
arches:
- amd64

18
pkg/init/Makefile
View File

@@ -1,4 +1,16 @@
IMAGE=init
DEPS=usermode-helper.c $(wildcard etc/*) $(wildcard etc/init.d/*) $(shell find cmd -type f)
.PHONY: push forcepush tag forcetag show-tag
include ../package.mk
push:
linuxkit pkg push .
forcepush:
linuxkit pkg push --force .
tag:
linuxkit pkg build .
forcetag:
linuxkit pkg build --force .
show-tag:
linuxkit pkg show-tag .

1
pkg/init/build.yml Normal file
View File

@@ -0,0 +1 @@
image: init

2
pkg/package.mk
View File

@@ -107,7 +107,7 @@ forcepush-y: forcetag-y check-dirty
docker push $(TAG)$(SUFFIX)
$(PUSH_MANIFEST) $(TAG) $(DOCKER_CONTENT_TRUST)
ifneq ($(RELEASE),)
docker tag $(TAG)$(SUFFIX) $(ORG)/$(IMAGE):$(RELEASE)
docker tag $(TAG)$(SUFFIX) $(ORG)/$(IMAGE):$(RELEASE)$(SUFFIX)
docker push $(ORG)/$(IMAGE):$(RELEASE)$(SUFFIX)
$(PUSH_MANIFEST) $(ORG)/$(IMAGE):$(RELEASE) $(DOCKER_CONTENT_TRUST)
endif