Preload DBSP container with demo projects

lalithsuresh · ryzhyk · commit 554c784aea1f · 2023-03-18T09:24:40.000-07:00
Signed-off-by: Lalith Suresh &lt;lsuresh@vmware.com&gt;
diff --git a/.dockerignore b/.dockerignore
@@ -4,4 +4,3 @@ target
 **/pipeline_data
 **/ldbc-graphalytics-data
 **/fraud_data
-demo
diff --git a/demo/create_demo_projects.sh b/demo/create_demo_projects.sh
@@ -4,6 +4,7 @@ THIS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 ROOT="${THIS_DIR}/../"
 SERVER_DIR="${ROOT}/crates/pipeline_manager/"
 
+
 set -e
 
 # We want non-matching wildcards to return an empty list
@@ -29,13 +30,3 @@ do
         printf "OK(config_id=$config_id)\n"
     done
 done
-
-for project_dir in "${project_prefix}"*
-do
-    project_name=${project_dir#$project_prefix}
-
-    if test -f "${project_dir}/prepare.sh"; then
-        echo "  Running custom project setup script"
-        "${project_dir}"/prepare.sh
-    fi
-done
diff --git a/demo/demo.sh b/demo/demo.sh
@@ -16,3 +16,4 @@ ${ROOT}/scripts/start_manager.sh ${THIS_DIR}/pipeline_data
 ${ROOT}/scripts/start_prometheus.sh ${THIS_DIR}/pipeline_data
 
 ${THIS_DIR}/create_demo_projects.sh
+${THIS_DIR}/prepare_demo_data.sh
diff --git a/demo/prepare_demo_data.sh b/demo/prepare_demo_data.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+THIS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
+set -e
+
+# We want non-matching wildcards to return an empty list
+# instead of a non-expanded wildcard.
+shopt -s nullglob
+
+project_prefix=${THIS_DIR}/project_
+
+for project_dir in "${project_prefix}"*
+do
+    project_name=${project_dir#$project_prefix}
+
+    if test -f "${project_dir}/prepare.sh"; then
+        echo "  Running custom project setup script"
+        "${project_dir}"/prepare.sh
+    fi
+done
diff --git a/deploy/Dockerfile b/deploy/Dockerfile
@@ -56,5 +56,8 @@ RUN cp /database-stream-processor/deploy/prometheus_datasource.yaml /etc/grafana
 
 ENV PATH="$PATH:/root/.cargo/bin"
 
+RUN /root/.cargo/bin/dbsp_pipeline_manager --bind-address=0.0.0.0 --working-directory=/working-dir --sql-compiler-home=/database-stream-processor/sql-to-dbsp-compiler --dbsp-override-path=/database-stream-processor --unix-daemon \
+    && /database-stream-processor/demo/create_demo_projects.sh
+
 CMD /database-stream-processor/scripts/start_prometheus.sh /working-dir && \
     /root/.cargo/bin/dbsp_pipeline_manager --bind-address=0.0.0.0 --working-directory=/working-dir --sql-compiler-home=/database-stream-processor/sql-to-dbsp-compiler --dbsp-override-path=/database-stream-processor

Original file line number	Diff line number	Diff line change
`@@ -16,3 +16,4 @@ ${ROOT}/scripts/start_manager.sh ${THIS_DIR}/pipeline_data`
`16`	`16`	`${ROOT}/scripts/start_prometheus.sh ${THIS_DIR}/pipeline_data`
`17`	`17`
`18`	`18`	`${THIS_DIR}/create_demo_projects.sh`
	`19`	`+${THIS_DIR}/prepare_demo_data.sh`