Don't export dom0 rootfs to the host

Don't export the dom0 rootfs to the host, use COPY --from to import it
directly from the previous build container.

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

diff --git a/build.sh b/build.sh
index cdd43f936bb27c973b622a1cb618bfbc14342103..9a2d1160c0ad3ecd12ec25d60eb46c89e6d5f928 100644 (file)
--- a/build.sh
+++ b/build.sh
@@ -19,16 +19,8 @@ if test -z "$exists"
 then
     docker build -f dom0/alpine-assemble -t $DOM0_LABEL .
 fi
-if ! test -f mkimage/"$DOM0_LABEL".tar
-then
-    # This is a workaround: find a better way
-    docker run $DOM0_LABEL /root/sleep &
-    sleep 1
-    container_id=`docker ps | grep $DOM0_LABEL | cut -f 1 -d " "`
-    docker export $container_id > out/"$DOM0_LABEL".tar
-    docker kill $container_id
-fi
 
+# Create final image
 exists=`docker images $IMAGE_BUILD_LABEL | grep $IMAGE_BUILD_LABEL`
 if test -z "$exists"
 then
@@ -38,6 +30,7 @@ fi
 # Create system image
 if ! test -f out/image
 then
+    mkdir -p out &>/dev/null
     docker run --privileged -i $IMAGE_BUILD_LABEL /make-efi > out/image
 fi
 

diff --git a/dom0/alpine-assemble b/dom0/alpine-assemble
index ab1eb14dc7b66caa00f95d279a7722f454833e37..47ef61788ae5cb28d18c36d7fea2857765469a18 100644 (file)
--- a/dom0/alpine-assemble
+++ b/dom0/alpine-assemble
@@ -23,7 +23,4 @@ RUN \
 # QEMU run deps
     apk add glib pixman libcap libattr
 
-
-ADD dom0/sleep /root
-
 ENTRYPOINT ["/bin/sh"]

diff --git a/mkimage/Dockerfile b/mkimage/Dockerfile
index 3de85f1ad7c61df67e372c0961bfebe7b4d4d8b8..f68f1ba096395fa014da7495536751590f834e3c 100644 (file)
--- a/mkimage/Dockerfile
+++ b/mkimage/Dockerfile
@@ -1,7 +1,5 @@
 FROM alpine AS grub-build
 
-ADD out/dom0.tar /root
-
 RUN apk update && apk add \
   automake \
   make \
@@ -24,6 +22,8 @@ search_disk_uuid tftp verify xzio xfs video multiboot2 gfxterm efi_gop efi_uga"
 ENV GRUB_COMMIT=6782f6d431d22b4e9ab14e94d263795c7991e160
 
 COPY mkimage/patches/* /patches/
+COPY --from=dom0 / /root
+
 RUN mkdir /grub-lib && \
   set -e && \
   git clone https://github.com/coreos/grub.git && \