Merge branch 'develop' into feat/pnpm

build-local-docker-image.sh

@@ -1,21 +1,33 @@
 #!/bin/bash
 # script to build local docker image.
 # highlevel steps involved
-# 1. build nocodb-sdk
+# 1. Stop and remove existing container and image
-# 2. build nc-gui
+# 2. Build nocodb-sdk
-#   2a. static build of nc-gui
+# 3. Build nc-gui
-#   2b. copy nc-gui build to nocodb dir
+#   3a. static build of nc-gui
-# 3. build nocodb 
+#   3b. copy nc-gui build to nocodb dir
+# 4. Build nocodb
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 LOG_FILE=${SCRIPT_DIR}/build-local-docker-image.log
 ERROR=""
 
+function stop_and_remove_container() {
+    # Stop and remove the existing container
+    docker stop nocodb-local >/dev/null 2>&1
+    docker rm nocodb-local >/dev/null 2>&1
+}
+
+function remove_image() {
+    # Remove the existing image
+    docker rmi nocodb-local >/dev/null 2>&1
+}
+
 function build_sdk(){
-    #build nocodb-sdk    
+    # build nocodb-sdk
     cd ${SCRIPT_DIR}/packages/nocodb-sdk
-    pnpm install || ERROR="sdk build failed"
+    npm ci || ERROR="sdk build failed"
-    pnpm run build || ERROR="sdk build failed"
+    npm run build || ERROR="sdk build failed"
 }
 
 function build_gui(){
@@ -23,8 +35,8 @@ function build_gui(){
     export NODE_OPTIONS="--max_old_space_size=16384"
     # generate static build of nc-gui
     cd ${SCRIPT_DIR}/packages/nc-gui
-    pnpm install || ERROR="gui build failed"
+    npm ci || ERROR="gui build failed"
-    pnpm run generate || ERROR="gui build failed"
+    npm run generate || ERROR="gui build failed"
 }
 
 function copy_gui_artifacts(){
@@ -36,7 +48,7 @@ function package_nocodb(){
     #build nocodb
     # build nocodb ( pack nocodb-sdk and nc-gui )
     cd ${SCRIPT_DIR}/packages/nocodb
-    pnpm install || ERROR="package_nocodb failed"
+    npm install || ERROR="package_nocodb failed"
     EE=true ./node_modules/.bin/webpack --config webpack.local.config.js || ERROR="package_nocodb failed"
 }
 
@@ -57,20 +69,24 @@ function log_message(){
     fi
 }
 
-echo "Info: Building nocodb-sdk" | tee ${LOG_FILE}
+echo "Info: Stopping and removing existing container and image" | tee ${LOG_FILE}
+stop_and_remove_container
+remove_image
+
+echo "Info: Building nocodb-sdk" | tee -a ${LOG_FILE}
 build_sdk 1>> ${LOG_FILE} 2>> ${LOG_FILE}
 
 echo "Info: Building nc-gui" | tee -a ${LOG_FILE}
 build_gui  1>> ${LOG_FILE} 2>> ${LOG_FILE}
 
-echo "Info: copy nc-gui build to nocodb dir" | tee -a ${LOG_FILE}
+echo "Info: Copy nc-gui build to nocodb dir" | tee -a ${LOG_FILE}
 copy_gui_artifacts 1>> ${LOG_FILE} 2>> ${LOG_FILE}
 
-echo "Info: build nocodb, package nocodb-sdk and nc-gui" | tee -a ${LOG_FILE}
+echo "Info: Build nocodb, package nocodb-sdk and nc-gui" | tee -a ${LOG_FILE}
 package_nocodb 1>> ${LOG_FILE} 2>> ${LOG_FILE}
 
 if [[ ${ERROR} == "" ]]; then
-    echo "Info: building docker image" | tee -a ${LOG_FILE}
+    echo "Info: Building docker image" | tee -a ${LOG_FILE}
     build_image 1>> ${LOG_FILE} 2>> ${LOG_FILE}
 fi