From: Stefano Stabellini <sstabellini@kernel.org>
Date: Wed, 22 Nov 2017 21:14:47 +0000 (-0800)
Subject: Build each container in in its own subdir
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=17809cf9529245854b70b05f4b9b0b04ad191131;p=people%2Fsstabellini%2Fmojo.git%2F.git

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 097c077..212789f 100755
--- 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 2f6e8d5..31226b3 100644
--- 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 7b7c95b..1106cde 100644
--- 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 d94b70b..4080938 100644
--- 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 8866e18..c247e80 100644
--- 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 09e8841..ce03e6b 100755
--- 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 2bb9e29..159d96c 100644
--- 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 af141d1..9fa1c49 100644
--- 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" ]