diff --git a/pkg/Makefile b/pkg/Makefile index 0a893c414..cc311ac95 100644 --- a/pkg/Makefile +++ b/pkg/Makefile @@ -1,23 +1,19 @@ -DIRS = $(shell find . -maxdepth 1 -mindepth 1 -type d) +DIRS = $(dir $(shell find . -maxdepth 2 -mindepth 2 -type f -name build.yml)) .PHONY: push force-push tag forcetag show-tag clean -# TODO(ijc) once all switch to `linuxkit pkg` update this to: -# linuxkit pkg [--force] $$d -# linuxkit pkg show-tag $$d - push: - @set -e; for d in $(DIRS); do make -C "$$d" push; done + @set -e; for d in $(DIRS); do linuxkit pkg push "$$d"; done forcepush: - @set -e; for d in $(DIRS); do make -C "$$d" forcepush; done + @set -e; for d in $(DIRS); do linuxkit pkg push --force "$$d"; done tag: - @set -e; for d in $(DIRS); do make -C "$$d" tag; done + @set -e; for d in $(DIRS); do linuxkit pkg build "$$d"; done forcetag: - @set -e; for d in $(DIRS); do make -C "$$d" forcetag; done + @set -e; for d in $(DIRS); do linuxkit pkg build --force "$$d"; done show-tag: - @set -e; for d in $(DIRS); do make -C "$$d" show-tag; done + @set -e; for d in $(DIRS); do linuxkit pkg show-tag "$$d"; done clean: diff --git a/pkg/acpid/Makefile b/pkg/acpid/Makefile deleted file mode 100644 index 5abb21c70..000000000 --- a/pkg/acpid/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE=acpid - -include ../package.mk diff --git a/pkg/acpid/build.yml b/pkg/acpid/build.yml new file mode 100644 index 000000000..cf21e8b14 --- /dev/null +++ b/pkg/acpid/build.yml @@ -0,0 +1 @@ +image: acpid diff --git a/pkg/auditd/Makefile b/pkg/auditd/Makefile deleted file mode 100644 index e7979ba6a..000000000 --- a/pkg/auditd/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -.PHONY: push forcepush tag forcetag show-tag - -push: - linuxkit pkg push . - -forcepush: - linuxkit pkg push --force . - -tag: - linuxkit pkg build . - -forcetag: - linuxkit pkg build --force . - -show-tag: - linuxkit pkg show-tag . diff --git a/pkg/binfmt/Makefile b/pkg/binfmt/Makefile deleted file mode 100644 index e7979ba6a..000000000 --- a/pkg/binfmt/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -.PHONY: push forcepush tag forcetag show-tag - -push: - linuxkit pkg push . - -forcepush: - linuxkit pkg push --force . - -tag: - linuxkit pkg build . - -forcetag: - linuxkit pkg build --force . - -show-tag: - linuxkit pkg show-tag . diff --git a/pkg/ca-certificates/Makefile b/pkg/ca-certificates/Makefile deleted file mode 100644 index 2b0c67f0c..000000000 --- a/pkg/ca-certificates/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE=ca-certificates - -include ../package.mk diff --git a/pkg/ca-certificates/build.yml b/pkg/ca-certificates/build.yml new file mode 100644 index 000000000..bf158e3b9 --- /dev/null +++ b/pkg/ca-certificates/build.yml @@ -0,0 +1 @@ +image: ca-certificates diff --git a/pkg/containerd/Makefile b/pkg/containerd/Makefile deleted file mode 100644 index 75be3d1d5..000000000 --- a/pkg/containerd/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=containerd -DEPS=$(wildcard cmd/service/*.go) etc/containerd/config.toml - -include ../package.mk diff --git a/pkg/containerd/build.yml b/pkg/containerd/build.yml new file mode 100644 index 000000000..1efcc2428 --- /dev/null +++ b/pkg/containerd/build.yml @@ -0,0 +1 @@ +image: containerd diff --git a/pkg/dhcpcd/Makefile b/pkg/dhcpcd/Makefile deleted file mode 100644 index 1e648453e..000000000 --- a/pkg/dhcpcd/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=dhcpcd -DEPS=dhcpcd.conf $(wildcard usr/lib/dhcpcd/dhcpcd-hooks/*) - -include ../package.mk diff --git a/pkg/dhcpcd/build.yml b/pkg/dhcpcd/build.yml new file mode 100644 index 000000000..47241f0fa --- /dev/null +++ b/pkg/dhcpcd/build.yml @@ -0,0 +1 @@ +image: dhcpcd diff --git a/pkg/extend/Makefile b/pkg/extend/Makefile deleted file mode 100644 index eaa9d62b2..000000000 --- a/pkg/extend/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=extend -DEPS=extend.go - -include ../package.mk diff --git a/pkg/extend/build.yml b/pkg/extend/build.yml new file mode 100644 index 000000000..6f10de7f3 --- /dev/null +++ b/pkg/extend/build.yml @@ -0,0 +1 @@ +image: extend diff --git a/pkg/format/Makefile b/pkg/format/Makefile deleted file mode 100644 index 587146eb1..000000000 --- a/pkg/format/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=format -DEPS=format.go - -include ../package.mk diff --git a/pkg/format/build.yml b/pkg/format/build.yml new file mode 100644 index 000000000..a205794ef --- /dev/null +++ b/pkg/format/build.yml @@ -0,0 +1 @@ +image: format diff --git a/pkg/getty/Makefile b/pkg/getty/Makefile deleted file mode 100644 index e7ba709a5..000000000 --- a/pkg/getty/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=getty -DEPS=usr/bin/rungetty.sh $(wildcard etc/*) $(wildcard etc/init.d/*) - -include ../package.mk diff --git a/pkg/getty/build.yml b/pkg/getty/build.yml new file mode 100644 index 000000000..05912cb5b --- /dev/null +++ b/pkg/getty/build.yml @@ -0,0 +1 @@ +image: getty diff --git a/pkg/host-timesync-daemon/Makefile b/pkg/host-timesync-daemon/Makefile deleted file mode 100644 index 85d0fa0f2..000000000 --- a/pkg/host-timesync-daemon/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -IMAGE=host-timesync-daemon -DEPS=$(wildcard *.go) -NETWORK=1 -ARCHES=x86_64 - -include ../package.mk diff --git a/pkg/host-timesync-daemon/build.yml b/pkg/host-timesync-daemon/build.yml new file mode 100644 index 000000000..c3ec54bd7 --- /dev/null +++ b/pkg/host-timesync-daemon/build.yml @@ -0,0 +1,4 @@ +image: host-timesync-daemon +network: true +arches: + - amd64 diff --git a/pkg/init-lcow/Makefile b/pkg/init-lcow/Makefile deleted file mode 100644 index c264416eb..000000000 --- a/pkg/init-lcow/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -IMAGE=init-lcow -NETWORK=1 -ARCHES=x86_64 - -include ../package.mk diff --git a/pkg/init-lcow/build.yml b/pkg/init-lcow/build.yml new file mode 100644 index 000000000..fcfca2dac --- /dev/null +++ b/pkg/init-lcow/build.yml @@ -0,0 +1,4 @@ +image: init-lcow +network: true +arches: + - amd64 diff --git a/pkg/init/Makefile b/pkg/init/Makefile deleted file mode 100644 index e7979ba6a..000000000 --- a/pkg/init/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -.PHONY: push forcepush tag forcetag show-tag - -push: - linuxkit pkg push . - -forcepush: - linuxkit pkg push --force . - -tag: - linuxkit pkg build . - -forcetag: - linuxkit pkg build --force . - -show-tag: - linuxkit pkg show-tag . diff --git a/pkg/ip/Makefile b/pkg/ip/Makefile deleted file mode 100644 index 7e97777ad..000000000 --- a/pkg/ip/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=ip -NETWORK=1 - -include ../package.mk diff --git a/pkg/ip/build.yml b/pkg/ip/build.yml new file mode 100644 index 000000000..0994a7321 --- /dev/null +++ b/pkg/ip/build.yml @@ -0,0 +1,2 @@ +image: ip +network: true diff --git a/pkg/metadata/Makefile b/pkg/metadata/Makefile deleted file mode 100644 index 369218447..000000000 --- a/pkg/metadata/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=metadata -DEPS=$(wildcard *.go) - -include ../package.mk diff --git a/pkg/metadata/build.yml b/pkg/metadata/build.yml new file mode 100644 index 000000000..60df83ac5 --- /dev/null +++ b/pkg/metadata/build.yml @@ -0,0 +1 @@ +image: metadata diff --git a/pkg/mkimage/Makefile b/pkg/mkimage/Makefile deleted file mode 100644 index 3df6a1b87..000000000 --- a/pkg/mkimage/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -IMAGE=mkimage -DEPS=mkimage.sh -ARCHES=x86_64 - -include ../package.mk diff --git a/pkg/mkimage/build.yml b/pkg/mkimage/build.yml new file mode 100644 index 000000000..1fa6e4f1c --- /dev/null +++ b/pkg/mkimage/build.yml @@ -0,0 +1,3 @@ +image: mkimage +arches: + - amd64 diff --git a/pkg/modprobe/Makefile b/pkg/modprobe/Makefile deleted file mode 100644 index c591652b6..000000000 --- a/pkg/modprobe/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE=modprobe - -include ../package.mk diff --git a/pkg/modprobe/build.yml b/pkg/modprobe/build.yml new file mode 100644 index 000000000..5c653ad79 --- /dev/null +++ b/pkg/modprobe/build.yml @@ -0,0 +1 @@ +image: modprobe diff --git a/pkg/mount/Makefile b/pkg/mount/Makefile deleted file mode 100644 index 6e246442b..000000000 --- a/pkg/mount/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=mount -DEPS=mountie.go - -include ../package.mk diff --git a/pkg/mount/build.yml b/pkg/mount/build.yml new file mode 100644 index 000000000..93801b226 --- /dev/null +++ b/pkg/mount/build.yml @@ -0,0 +1 @@ +image: mount diff --git a/pkg/node_exporter/Makefile b/pkg/node_exporter/build.yml-skip similarity index 63% rename from pkg/node_exporter/Makefile rename to pkg/node_exporter/build.yml-skip index be11d9673..0251be216 100644 --- a/pkg/node_exporter/Makefile +++ b/pkg/node_exporter/build.yml-skip @@ -1,6 +1,3 @@ -IMAGE=node_exporter +image: node_exporter # Can't pull with content trust. Skip for now # https://github.com/linuxkit/linuxkit/issues/2349 -ARCHES=SKIP - -include ../package.mk diff --git a/pkg/open-vm-tools/Makefile b/pkg/open-vm-tools/Makefile deleted file mode 100644 index 4befe5b01..000000000 --- a/pkg/open-vm-tools/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=open-vm-tools -ARCHES=x86_64 - -include ../package.mk diff --git a/pkg/open-vm-tools/build.yml b/pkg/open-vm-tools/build.yml new file mode 100644 index 000000000..4c99f31a8 --- /dev/null +++ b/pkg/open-vm-tools/build.yml @@ -0,0 +1,3 @@ +image: open-vm-tools +arches: + - amd64 diff --git a/pkg/openntpd/Makefile b/pkg/openntpd/Makefile deleted file mode 100644 index 8cfe5e8e4..000000000 --- a/pkg/openntpd/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=openntpd -DEPS=etc/ntpd.conf - -include ../package.mk diff --git a/pkg/openntpd/build.yml b/pkg/openntpd/build.yml new file mode 100644 index 000000000..d9bf82d9b --- /dev/null +++ b/pkg/openntpd/build.yml @@ -0,0 +1 @@ +image: openntpd diff --git a/pkg/qemu-ga/Makefile b/pkg/qemu-ga/Makefile deleted file mode 100644 index 0a28bef1b..000000000 --- a/pkg/qemu-ga/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE=qemu-ga - -include ../package.mk diff --git a/pkg/qemu-ga/build.yml b/pkg/qemu-ga/build.yml new file mode 100644 index 000000000..70e6af2d3 --- /dev/null +++ b/pkg/qemu-ga/build.yml @@ -0,0 +1 @@ +image: qemu-ga diff --git a/pkg/rngd/Makefile b/pkg/rngd/Makefile deleted file mode 100644 index 0f5b8696a..000000000 --- a/pkg/rngd/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=rngd -DEPS:=$(wildcard cmd/rngd/*.go) $(shell find cmd/rngd/vendor) - -include ../package.mk diff --git a/pkg/rngd/build.yml b/pkg/rngd/build.yml new file mode 100644 index 000000000..b3cbd7f5c --- /dev/null +++ b/pkg/rngd/build.yml @@ -0,0 +1 @@ +image: rngd diff --git a/pkg/runc/Makefile b/pkg/runc/Makefile deleted file mode 100644 index 7f676177c..000000000 --- a/pkg/runc/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=runc -NETWORK=1 - -include ../package.mk diff --git a/pkg/runc/build.yml b/pkg/runc/build.yml new file mode 100644 index 000000000..51ad94759 --- /dev/null +++ b/pkg/runc/build.yml @@ -0,0 +1,2 @@ +image: runc +network: true diff --git a/pkg/sshd/Makefile b/pkg/sshd/Makefile deleted file mode 100644 index e64eb4faa..000000000 --- a/pkg/sshd/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=sshd -DEPS=etc/motd etc/ssh/sshd_config usr/bin/ssh.sh - -include ../package.mk diff --git a/pkg/sshd/build.yml b/pkg/sshd/build.yml new file mode 100644 index 000000000..7c04a29f8 --- /dev/null +++ b/pkg/sshd/build.yml @@ -0,0 +1 @@ +image: sshd diff --git a/pkg/swap/Makefile b/pkg/swap/Makefile deleted file mode 100644 index 669b38f68..000000000 --- a/pkg/swap/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=swap -DEPS=swap.sh - -include ../package.mk diff --git a/pkg/swap/build.yml b/pkg/swap/build.yml new file mode 100644 index 000000000..2c8a3583e --- /dev/null +++ b/pkg/swap/build.yml @@ -0,0 +1 @@ +image: swap diff --git a/pkg/sysctl/Makefile b/pkg/sysctl/Makefile deleted file mode 100644 index 22f5292d5..000000000 --- a/pkg/sysctl/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=sysctl -DEPS=main.go - -include ../package.mk diff --git a/pkg/sysctl/build.yml b/pkg/sysctl/build.yml new file mode 100644 index 000000000..21d62da47 --- /dev/null +++ b/pkg/sysctl/build.yml @@ -0,0 +1 @@ +image: sysctl diff --git a/pkg/sysfs/Makefile b/pkg/sysfs/Makefile deleted file mode 100644 index 530544fab..000000000 --- a/pkg/sysfs/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=sysfs -DEPS=main.go - -include ../package.mk diff --git a/pkg/sysfs/build.yml b/pkg/sysfs/build.yml new file mode 100644 index 000000000..642d0d047 --- /dev/null +++ b/pkg/sysfs/build.yml @@ -0,0 +1 @@ +image: sysfs diff --git a/pkg/trim-after-delete/Makefile b/pkg/trim-after-delete/Makefile deleted file mode 100644 index 3147801dc..000000000 --- a/pkg/trim-after-delete/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=trim-after-delete -DEPS=$(wildcard *.go) - -include ../package.mk diff --git a/pkg/trim-after-delete/build.yml b/pkg/trim-after-delete/build.yml new file mode 100644 index 000000000..3ddef36f7 --- /dev/null +++ b/pkg/trim-after-delete/build.yml @@ -0,0 +1 @@ +image: trim-after-delete diff --git a/pkg/tss/Makefile b/pkg/tss/Makefile deleted file mode 100644 index f8644cfa4..000000000 --- a/pkg/tss/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -IMAGE=tss -NETWORK=1 -DEPS=$(wildcard upload/out/*) $(wildcard upload/out/etc/*) $(wildacrd upload/src/savedeps/*) $(wildcard upload/src/glibc_stubs/*) -ARCHES=x86_64 - -include ../package.mk - diff --git a/pkg/tss/build.yml b/pkg/tss/build.yml new file mode 100644 index 000000000..e72bb1b91 --- /dev/null +++ b/pkg/tss/build.yml @@ -0,0 +1,4 @@ +image: tss +network: true +arches: + - amd64 diff --git a/pkg/vpnkit-expose-port/Makefile b/pkg/vpnkit-expose-port/Makefile deleted file mode 100644 index 8339cab6f..000000000 --- a/pkg/vpnkit-expose-port/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -IMAGE=vpnkit-expose-port -DEPS=$(wildcard *.go) -NETWORK=1 -ARCHES=x86_64 - -include ../package.mk - diff --git a/pkg/vpnkit-expose-port/build.yml b/pkg/vpnkit-expose-port/build.yml new file mode 100644 index 000000000..2d1b9b153 --- /dev/null +++ b/pkg/vpnkit-expose-port/build.yml @@ -0,0 +1,4 @@ +image: vpnkit-expose-port +network: true +arches: + - amd64 diff --git a/pkg/vpnkit-forwarder/Makefile b/pkg/vpnkit-forwarder/Makefile deleted file mode 100644 index 059ab737f..000000000 --- a/pkg/vpnkit-forwarder/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -IMAGE=vpnkit-forwarder -DEPS=$(wildcard *.go) -NETWORK=1 -ARCHES=x86_64 - -include ../package.mk diff --git a/pkg/vpnkit-forwarder/build.yml b/pkg/vpnkit-forwarder/build.yml new file mode 100644 index 000000000..a2b7606ed --- /dev/null +++ b/pkg/vpnkit-forwarder/build.yml @@ -0,0 +1,4 @@ +image: vpnkit-forwarder +network: true +arches: + - amd64 diff --git a/pkg/vsudd/Makefile b/pkg/vsudd/Makefile deleted file mode 100644 index 75b909fc9..000000000 --- a/pkg/vsudd/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -IMAGE=vsudd -DEPS=$(wildcard *.go) -NETWORK=1 -ARCHES=x86_64 - -include ../package.mk diff --git a/pkg/vsudd/build.yml b/pkg/vsudd/build.yml new file mode 100644 index 000000000..9ff509e9a --- /dev/null +++ b/pkg/vsudd/build.yml @@ -0,0 +1,4 @@ +image: vsudd +network: true +arches: + - amd64