Build each container in in its own subdir

Not only it is cleaner, but it makes linuxkit integration easier.

Signed-off-by: Stefano Stabellini <sstabellini@kernel.org>

diff --git a/alpine-dom0/build.sh b/alpine-dom0/build.sh
index 097c0773cc8ca685b62e90c09f7aa801b25c9ba1..212789f13343d3cbaaa247ba6e5305b924197686 100755 (executable)
--- a/alpine-dom0/build.sh
+++ b/alpine-dom0/build.sh
@@ -5,6 +5,6 @@ do
     exists=`docker images $label | grep $label`
     if test -z "$exists"
     then
-        docker build -f alpine-dom0/$label/Dockerfile -t $label .
+        docker build -f alpine-dom0/$label/Dockerfile -t $label alpine-dom0/$label
     fi
 done

diff --git a/alpine-dom0/dom0/Dockerfile b/alpine-dom0/dom0/Dockerfile
index 2f6e8d5c0e8cae39bc7cc16f5bb201149ce0f8fa..31226b328ce3d1fc0cc37ef04eed25efb59b699f 100644 (file)
--- a/alpine-dom0/dom0/Dockerfile
+++ b/alpine-dom0/dom0/Dockerfile
@@ -4,7 +4,7 @@ RUN \
        apk update && \
        apk add openrc
 
-ADD alpine-dom0/dom0/udhcpc.script /usr/share/udhcpc/default.script
+ADD udhcpc.script /usr/share/udhcpc/default.script
 COPY --from=linux-builder /out/ /
 
 RUN \

diff --git a/alpine-dom0/linux-builder/Dockerfile b/alpine-dom0/linux-builder/Dockerfile
index 7b7c95b45e8f098c03047de2966500e687d6c928..1106cdea1bb1104d36350b7210ddbb970526277f 100644 (file)
--- a/alpine-dom0/linux-builder/Dockerfile
+++ b/alpine-dom0/linux-builder/Dockerfile
@@ -1,6 +1,6 @@
 FROM qemu-builder as linux-builder
 
-COPY alpine-dom0/linux-builder/linux-config /root/
+COPY linux-config /root/
 
 ENV SOURCE_DIR=/root
 ENV OUT_DIR=/out

diff --git a/alpine-dom0/qemu-builder/Dockerfile b/alpine-dom0/qemu-builder/Dockerfile
index d94b70b281f2916439e2f994e213cb4162b1fe35..4080938817ad0cea67a07414c8b19a203c0f2c81 100644 (file)
--- a/alpine-dom0/qemu-builder/Dockerfile
+++ b/alpine-dom0/qemu-builder/Dockerfile
@@ -1,6 +1,6 @@
 FROM xen-builder as qemu-builder
 
-COPY alpine-dom0/qemu-builder/qemu-patch /root/
+COPY qemu-patch /root/
 
 ENV SOURCE_DIR=/root
 ENV OUT_DIR=/out

diff --git a/alpine-dom0/xen-builder/Dockerfile b/alpine-dom0/xen-builder/Dockerfile
index 8866e186ea550e4db851d60d059efda30fef6e14..c247e803ad1cbc5d4393f32251e82beaa9ede563 100644 (file)
--- a/alpine-dom0/xen-builder/Dockerfile
+++ b/alpine-dom0/xen-builder/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine as xen-builder
 
-COPY alpine-dom0/xen-builder/xen-patch /root/
+COPY xen-patch /root/
 
 ENV SOURCE_DIR=/root
 ENV OUT_DIR=/out

diff --git a/mkimage/build.sh b/mkimage/build.sh
index 09e88411dc88da292d7dddf58c1233a20b12d66f..ce03e6b0fc1d80b7caa79985a50d0bb41b3304b4 100755 (executable)
--- a/mkimage/build.sh
+++ b/mkimage/build.sh
@@ -7,7 +7,7 @@ do
     exists=`docker images $label | grep $label`
     if test -z "$exists"
     then
-        docker build -f mkimage/$label/Dockerfile -t $label .
+        docker build -f mkimage/$label/Dockerfile -t $label mkimage/$label
     fi
 done
 

diff --git a/mkimage/grub-builder/Dockerfile b/mkimage/grub-builder/Dockerfile
index 2bb9e29b8ec9f6b1a165a37c218b13cfa9331cb0..159d96c8f81a9a38b616eaeb684bb737e4e54cf8 100644 (file)
--- a/mkimage/grub-builder/Dockerfile
+++ b/mkimage/grub-builder/Dockerfile
@@ -21,7 +21,7 @@ ENV GRUB_MODULES="part_gpt fat ext2 iso9660 gzio linux acpi normal cpio crypto d
 search_disk_uuid tftp verify xzio xfs video multiboot2 gfxterm efi_gop efi_uga"
 ENV GRUB_COMMIT=6782f6d431d22b4e9ab14e94d263795c7991e160
 
-COPY mkimage/grub-builder/patches/* /patches/
+COPY patches/* /patches/
 
 RUN mkdir /grub-lib && \
   set -e && \

diff --git a/mkimage/image-builder/Dockerfile b/mkimage/image-builder/Dockerfile
index af141d11aeca421fa12913e5b09c659623206df3..9fa1c496307bbe88b8914297d8c64b82a5808698 100644 (file)
--- a/mkimage/image-builder/Dockerfile
+++ b/mkimage/image-builder/Dockerfile
@@ -18,6 +18,6 @@ RUN \
   multipath-tools \
   && true
 
-COPY mkimage/image-builder/make-efi /
+COPY make-efi /
 
 ENTRYPOINT [ "/bin/sh" ]