omnibus: minor fixes (#744)

finos · Aug 31, 2023 · 02e05b8 · 02e05b8
1 parent 9a58806
commit 02e05b8
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/installers/omnibus/.env b/installers/omnibus/.env
@@ -10,10 +10,12 @@
 LEGEND_OMNIBUS_IMAGE_VERSION=2023-08-25_1
 LEGEND_OMNIBUS_ENGINE_VERSION=4.25.2
 LEGEND_OMNIBUS_SDLC_VERSION=0.141.0
-LEGEND_OMNIBUS_SDLC_FS_VERSION=0.141.0
 LEGEND_OMNIBUS_PURE_IDE_VERSION=4.17.0
 LEGEND_OMNIBUS_STUDIO_VERSION=10.16.0
 
+LEGEND_OMNIBUS_SDLC_DEMO_IN_MEMORY_VERSION=latest
+LEGEND_OMNIBUS_SDLC_DEMO_FILE_SYSTEM_VERSION=0.141.0
+
 ####################################################################################
 
 # Supervisor

diff --git a/installers/omnibus/variants/ghc/Dockerfile b/installers/omnibus/variants/ghc/Dockerfile
@@ -3,13 +3,13 @@
 ARG LEGEND_OMNIBUS_IMAGE_VERSION
 ARG LEGEND_OMNIBUS_ENGINE_VERSION
 ARG LEGEND_OMNIBUS_SDLC_VERSION
-ARG LEGEND_OMNIBUS_SDLC_FS_VERSION
+ARG LEGEND_OMNIBUS_SDLC_DEMO_FILE_SYSTEM_VERSION
 ARG LEGEND_OMNIBUS_STUDIO_VERSION
 
 FROM finos/legend-engine-server:${LEGEND_OMNIBUS_ENGINE_VERSION} AS engine-image
 FROM finos/legend-sdlc-server:${LEGEND_OMNIBUS_SDLC_VERSION} AS sdlc-image
 FROM finos/legend-studio:${LEGEND_OMNIBUS_STUDIO_VERSION} AS studio-image
-FROM finos/legend-sdlc-server-fs:${LEGEND_OMNIBUS_SDLC_FS_VERSION} AS sdlc-fs-image
+FROM finos/legend-sdlc-server-fs:${LEGEND_OMNIBUS_SDLC_DEMO_FILE_SYSTEM_VERSION} AS sdlc-fs-image
 
 FROM eclipse-temurin:11.0.19_7-jdk-jammy
 RUN apt-get update && apt-get install -y wget nano
@@ -55,10 +55,10 @@ ENV LEGEND_OMNIBUS_SDLC_PORT=${LEGEND_OMNIBUS_SDLC_PORT}
 ENV LEGEND_OMNIBUS_SDLC_ADMIN_PORT=${LEGEND_OMNIBUS_SDLC_ADMIN_PORT}
 
 # Legend SDLC FS
-ARG LEGEND_OMNIBUS_SDLC_FS_VERSION
+ARG LEGEND_OMNIBUS_SDLC_DEMO_FILE_SYSTEM_VERSION
 ARG LEGEND_OMNIBUS_SDLC_FS_ROOT_DIR
 
-ENV LEGEND_OMNIBUS_SDLC_FS_VERSION=${LEGEND_OMNIBUS_SDLC_FS_VERSION}
+ENV LEGEND_OMNIBUS_SDLC_DEMO_FILE_SYSTEM_VERSION=${LEGEND_OMNIBUS_SDLC_DEMO_FILE_SYSTEM_VERSION}
 ENV LEGEND_OMNIBUS_SDLC_FS_ROOT_DIR=${LEGEND_OMNIBUS_SDLC_FS_ROOT_DIR}
 
 # Legend Studio

diff --git a/installers/omnibus/variants/ghc/build.sh b/installers/omnibus/variants/ghc/build.sh
@@ -20,7 +20,7 @@ docker build \
   --build-arg LEGEND_OMNIBUS_ENGINE_TEMP_DB_PORT=$LEGEND_OMNIBUS_ENGINE_TEMP_DB_PORT \
   \
   --build-arg LEGEND_OMNIBUS_SDLC_VERSION=$LEGEND_OMNIBUS_SDLC_VERSION \
-  --build-arg LEGEND_OMNIBUS_SDLC_FS_VERSION=$LEGEND_OMNIBUS_SDLC_FS_VERSION \
+  --build-arg LEGEND_OMNIBUS_SDLC_DEMO_FILE_SYSTEM_VERSION=$LEGEND_OMNIBUS_SDLC_DEMO_FILE_SYSTEM_VERSION \
   --build-arg LEGEND_OMNIBUS_SDLC_PORT=$LEGEND_OMNIBUS_SDLC_PORT \
   --build-arg LEGEND_OMNIBUS_SDLC_ADMIN_PORT=$LEGEND_OMNIBUS_SDLC_ADMIN_PORT \
   --build-arg LEGEND_OMNIBUS_SDLC_FS_ROOT_DIR=$LEGEND_OMNIBUS_SDLC_FS_ROOT_DIR \

diff --git a/installers/omnibus/variants/slim/Dockerfile b/installers/omnibus/variants/slim/Dockerfile
@@ -3,13 +3,13 @@
 ARG LEGEND_OMNIBUS_IMAGE_VERSION
 ARG LEGEND_OMNIBUS_ENGINE_VERSION
 ARG LEGEND_OMNIBUS_SDLC_VERSION
-ARG LEGEND_OMNIBUS_SDLC_DEMO_VERSION
+ARG LEGEND_OMNIBUS_SDLC_DEMO_IN_MEMORY_VERSION
 ARG LEGEND_OMNIBUS_STUDIO_VERSION
 
 FROM finos/legend-engine-server:${LEGEND_OMNIBUS_ENGINE_VERSION} AS engine-image
 FROM finos/legend-sdlc-server:${LEGEND_OMNIBUS_SDLC_VERSION} AS sdlc-image
 FROM finos/legend-studio:${LEGEND_OMNIBUS_STUDIO_VERSION} AS studio-image
-FROM legenddemo/legend-sdlc-server-demo:${LEGEND_OMNIBUS_SDLC_DEMO_VERSION} as sdlc-demo-image
+FROM legenddemo/legend-sdlc-server-demo:${LEGEND_OMNIBUS_SDLC_DEMO_IN_MEMORY_VERSION} as sdlc-demo-image
 
 FROM eclipse-temurin:11.0.19_7-jdk-jammy
 RUN apt-get update && apt-get install -y wget nano
@@ -55,9 +55,9 @@ ENV LEGEND_OMNIBUS_SDLC_PORT=${LEGEND_OMNIBUS_SDLC_PORT}
 ENV LEGEND_OMNIBUS_SDLC_ADMIN_PORT=${LEGEND_OMNIBUS_SDLC_ADMIN_PORT}
 
 # Legend SDLC Demo
-ARG LEGEND_OMNIBUS_SDLC_DEMO_VERSION
+ARG LEGEND_OMNIBUS_SDLC_DEMO_IN_MEMORY_VERSION
 
-ENV LEGEND_OMNIBUS_SDLC_DEMO_VERSION=${LEGEND_OMNIBUS_SDLC_DEMO_VERSION}
+ENV LEGEND_OMNIBUS_SDLC_DEMO_IN_MEMORY_VERSION=${LEGEND_OMNIBUS_SDLC_DEMO_IN_MEMORY_VERSION}
 
 # Legend Studio
 ARG LEGEND_OMNIBUS_STUDIO_VERSION

diff --git a/installers/omnibus/variants/slim/build.sh b/installers/omnibus/variants/slim/build.sh
@@ -20,7 +20,7 @@ docker build \
   --build-arg LEGEND_OMNIBUS_ENGINE_TEMP_DB_PORT=$LEGEND_OMNIBUS_ENGINE_TEMP_DB_PORT \
   \
   --build-arg LEGEND_OMNIBUS_SDLC_VERSION=$LEGEND_OMNIBUS_SDLC_VERSION \
-  --build-arg LEGEND_OMNIBUS_SDLC_DEMO_VERSION=$LEGEND_OMNIBUS_SDLC_DEMO_VERSION \
+  --build-arg LEGEND_OMNIBUS_SDLC_DEMO_IN_MEMORY_VERSION=$LEGEND_OMNIBUS_SDLC_DEMO_IN_MEMORY_VERSION \
   --build-arg LEGEND_OMNIBUS_SDLC_PORT=$LEGEND_OMNIBUS_SDLC_PORT \
   --build-arg LEGEND_OMNIBUS_SDLC_ADMIN_PORT=$LEGEND_OMNIBUS_SDLC_ADMIN_PORT \
   \