From: Stefano Stabellini <sstabellini@kernel.org>
Date: Tue, 28 Nov 2017 00:34:04 +0000 (-0800)
Subject: Use LinuxKit for the build, when available
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8b7385d7f23f48f72269ac9873e25a4a28dc11e1;p=people%2Fsstabellini%2Fmojo.git%2F.git

Use LinuxKit for the build, when available

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

diff --git a/alpine-dom0/build.sh b/alpine-dom0/build.sh
index 212789f..d8b3d07 100755
--- a/alpine-dom0/build.sh
+++ b/alpine-dom0/build.sh
@@ -1,10 +1,21 @@
 #!/bin/sh
 
-for label in `cat alpine-dom0/series`
-do
-    exists=`docker images $label | grep $label`
-    if test -z "$exists"
+build() {
+    label=$1
+
+    if test `which linuxkit`
     then
-        docker build -f alpine-dom0/$label/Dockerfile -t $label alpine-dom0/$label
+        linuxkit pkg build --disable-content-trust -hash $label alpine-dom0/$label/
+    else
+        exists=`docker images -q "mojoos/$label"`
+        if test -z "$exists"
+        then
+            docker build -f alpine-dom0/$label/Dockerfile -t mojoos/$label alpine-dom0/$label
+        fi
     fi
+}
+
+for label in `cat alpine-dom0/series`
+do
+    build $label
 done
diff --git a/mkimage/build.sh b/mkimage/build.sh
index ce03e6b..28fae4a 100755
--- a/mkimage/build.sh
+++ b/mkimage/build.sh
@@ -1,14 +1,25 @@
 HOME_DIR=`pwd`
 OUT_DIR=$HOME_DIR/out
-IMAGE_BUILD_LABEL="image-builder"
+IMAGE_BUILD_LABEL="mojoos/image-builder:image-builder"
 
-for label in `cat mkimage/series`
-do
-    exists=`docker images $label | grep $label`
-    if test -z "$exists"
+build() {
+    label=$1
+
+    if test `which linuxkit`
     then
-        docker build -f mkimage/$label/Dockerfile -t $label mkimage/$label
+        linuxkit pkg build --disable-content-trust -hash $label mkimage/$label/
+    else
+        exists=`docker images -q "mojoos/$label"`
+        if test -z "$exists"
+        then
+            docker build -f mkimage/$label/Dockerfile -t mojoos/$label mkimage/$label
+        fi
     fi
+}
+
+for label in `cat mkimage/series`
+do
+    build $label
 done
 
 # Create system image