From a5e74f2769d479f0836e206117642c07f303fbd5 Mon Sep 17 00:00:00 2001
From: "Zheng, Qi" <huaiqing.zq@antgroup.com>
Date: Sun, 26 Sep 2021 11:57:38 +0800
Subject: [PATCH] Update sqlite demo with copy_bom tool

Signed-off-by: Zheng, Qi <huaiqing.zq@antgroup.com>
---
 demos/sqlite/run_sqlite_on_occlum.sh | 17 +++++++++++------
 demos/sqlite/sqlite.yaml             | 10 ++++++++++
 2 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 demos/sqlite/sqlite.yaml

diff --git a/demos/sqlite/run_sqlite_on_occlum.sh b/demos/sqlite/run_sqlite_on_occlum.sh
index f8511bfc..83a5a337 100755
--- a/demos/sqlite/run_sqlite_on_occlum.sh
+++ b/demos/sqlite/run_sqlite_on_occlum.sh
@@ -1,7 +1,12 @@
 #!/bin/bash
 set -e
 
-DEMO=sqlite_demo
+SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+bomfile=${SCRIPT_DIR}/sqlite.yaml
+
+export DEMO=sqlite_demo
+export SPEEDTEST=speedtest1
+
 SQL_DB=/root/company.db
 SQL_STMT="CREATE TABLE COMPANY ( \
     ID INT PRIMARY KEY NOT NULL, \
@@ -11,7 +16,7 @@ SQL_STMT="CREATE TABLE COMPANY ( \
     SALARY REAL ); \
     INSERT INTO COMPANY VALUES ( 1, 'Kris', 27, 'California', 16000.00 ); \
     SELECT * FROM COMPANY;"
-SPEEDTEST=speedtest1
+
 
 if [ ! -e $DEMO ];then
     echo "Error: cannot stat '$DEMO'"
@@ -26,13 +31,13 @@ if [ ! -e $SPEEDTEST ];then
 fi
 
 # 1. Init Occlum Workspace
-rm -rf occlum_instance && mkdir occlum_instance
+rm -rf occlum_instance && occlum new occlum_instance
 cd occlum_instance
-occlum init
 
 # 2. Copy files into Occlum Workspace and build
-cp ../$DEMO image/bin
-cp ../$SPEEDTEST image/bin
+rm -rf image
+copy_bom -f $bomfile --root image --include-dir /opt/occlum/etc/template
+
 occlum build
 
 # 3. Run the demo
diff --git a/demos/sqlite/sqlite.yaml b/demos/sqlite/sqlite.yaml
new file mode 100644
index 00000000..ecaf6b94
--- /dev/null
+++ b/demos/sqlite/sqlite.yaml
@@ -0,0 +1,10 @@
+includes:
+  - base.yaml
+# sqlite
+targets:
+  # copy bins
+  - target: /bin
+    copy:
+      - files:
+        - ../$DEMO
+        - ../$SPEEDTEST