From: Stefano Stabellini Date: Tue, 28 Nov 2017 00:28:41 +0000 (-0800) Subject: Make the build system LinuxKit ready X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a7d2e89bf0da761f3b028fd4c3b017bc8f0d1305;p=people%2Fsstabellini%2Fmojo.git%2F.git Make the build system LinuxKit ready Signed-off-by: Stefano Stabellini --- diff --git a/alpine-dom0/dom0/Dockerfile b/alpine-dom0/dom0/Dockerfile index 31226b3..650e488 100644 --- a/alpine-dom0/dom0/Dockerfile +++ b/alpine-dom0/dom0/Dockerfile @@ -5,7 +5,7 @@ RUN \ apk add openrc ADD udhcpc.script /usr/share/udhcpc/default.script -COPY --from=linux-builder /out/ / +COPY --from=mojoos/linux-builder:linux-builder /out/ / RUN \ rc-update add networking sysinit && \ diff --git a/alpine-dom0/dom0/build.yml b/alpine-dom0/dom0/build.yml new file mode 100644 index 0000000..05dfc7c --- /dev/null +++ b/alpine-dom0/dom0/build.yml @@ -0,0 +1,3 @@ +image: dom0 +org: mojoos +network: yes diff --git a/alpine-dom0/linux-builder/Dockerfile b/alpine-dom0/linux-builder/Dockerfile index 1106cde..d8b29a3 100644 --- a/alpine-dom0/linux-builder/Dockerfile +++ b/alpine-dom0/linux-builder/Dockerfile @@ -1,4 +1,4 @@ -FROM qemu-builder as linux-builder +FROM mojoos/qemu-builder:qemu-builder as linux-builder COPY linux-config /root/ diff --git a/alpine-dom0/linux-builder/build.yml b/alpine-dom0/linux-builder/build.yml new file mode 100644 index 0000000..ceffdbe --- /dev/null +++ b/alpine-dom0/linux-builder/build.yml @@ -0,0 +1,3 @@ +image: linux-builder +org: mojoos +network: yes diff --git a/alpine-dom0/qemu-builder/Dockerfile b/alpine-dom0/qemu-builder/Dockerfile index 4080938..6c489f5 100644 --- a/alpine-dom0/qemu-builder/Dockerfile +++ b/alpine-dom0/qemu-builder/Dockerfile @@ -1,4 +1,4 @@ -FROM xen-builder as qemu-builder +FROM mojoos/xen-builder:xen-builder as qemu-builder COPY qemu-patch /root/ diff --git a/alpine-dom0/qemu-builder/build.yml b/alpine-dom0/qemu-builder/build.yml new file mode 100644 index 0000000..63da5fd --- /dev/null +++ b/alpine-dom0/qemu-builder/build.yml @@ -0,0 +1,3 @@ +image: qemu-builder +org: mojoos +network: yes diff --git a/alpine-dom0/xen-builder/build.yml b/alpine-dom0/xen-builder/build.yml new file mode 100644 index 0000000..1159d5b --- /dev/null +++ b/alpine-dom0/xen-builder/build.yml @@ -0,0 +1,3 @@ +image: xen-builder +org: mojoos +network: yes diff --git a/mkimage/grub-builder/build.yml b/mkimage/grub-builder/build.yml new file mode 100644 index 0000000..57247c7 --- /dev/null +++ b/mkimage/grub-builder/build.yml @@ -0,0 +1,3 @@ +image: grub-builder +org: mojoos +network: yes diff --git a/mkimage/image-builder/Dockerfile b/mkimage/image-builder/Dockerfile index 9fa1c49..40d4b89 100644 --- a/mkimage/image-builder/Dockerfile +++ b/mkimage/image-builder/Dockerfile @@ -1,6 +1,6 @@ -FROM grub-builder AS image-builder +FROM mojoos/grub-builder:grub-builder AS image-builder -COPY --from=dom0 / /out +COPY --from=mojoos/dom0:dom0 / /out RUN \ apk update && apk upgrade && \ diff --git a/mkimage/image-builder/build.yml b/mkimage/image-builder/build.yml new file mode 100644 index 0000000..fe22d43 --- /dev/null +++ b/mkimage/image-builder/build.yml @@ -0,0 +1,3 @@ +image: image-builder +org: mojoos +network: yes