Merge pull request #42 from sinto-aot/uninstall-updations

Uninstall updations
AOT-Technologies · May 25, 2023 · e29b38a · e29b38a
2 parents 10b9dcf + 4a03ed2
commit e29b38a
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 15 deletions.
diff --git a/docker-compose/docker-compose-arm64.yml b/docker-compose/docker-compose-arm64.yml
@@ -53,7 +53,7 @@ services:
       - formsflow
 
   forms-flow-web:
-    image: formsflow/forms-flow-web:v5.1.0
+    image: formsflow/forms-flow-web:v5.1.1
     volumes:
       - ./configuration/config.js:/usr/share/nginx/html/config/config.js
     links:
@@ -65,16 +65,16 @@ services:
       - formsflow
 
   forms-flow-forms:
-    image: formsflow/forms-flow-forms:v5.1.0
+    image: formsflow/forms-flow-forms:v5.1.1
     restart: always
     environment:
       DEBUG: formio:*
       NODE_CONFIG: "{\"mongo\":\"mongodb://${FORMIO_DB_USERNAME:-admin}:${FORMIO_DB_PASSWORD:-changeme}@forms-flow-forms-db:27017/${FORMIO_DB_NAME:-formio}?authMechanism=SCRAM-SHA-1&authSource=admin\"}"
       ROOT_EMAIL: ${FORMIO_ROOT_EMAIL:[email protected]}
       ROOT_PASSWORD: ${FORMIO_ROOT_PASSWORD:-changeme}
       FORMIO_DOMAIN: ${FORMIO_DEFAULT_PROJECT_URL}
-      FORMIO_CLIENT_UI: ${FORMIO_CLIENT_UI:-false}
       FORMIO_JWT_SECRET: ${FORMIO_JWT_SECRET}
+      NO_INSTALL: ${NO_INSTALL:-1}
     ports:
       - "3001:3001"
     links:
@@ -96,7 +96,7 @@ services:
       - formsflow
 
   forms-flow-bpm:
-    image: formsflow/forms-flow-bpm:v5.1.0-arm64
+    image: formsflow/forms-flow-bpm:v5.1.1-arm64
     restart: always
     environment:
       - KEYCLOAK_URL=${KEYCLOAK_URL}
@@ -151,7 +151,7 @@ services:
       - formsflow
 
   forms-flow-webapi:
-    image: formsflow/forms-flow-webapi:v5.1.0
+    image: formsflow/forms-flow-webapi:v5.1.1
     restart: always
     links:
       - forms-flow-webapi-db

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
@@ -53,7 +53,7 @@ services:
       - formsflow
 
   forms-flow-web:
-    image: formsflow/forms-flow-web:v5.1.0
+    image: formsflow/forms-flow-web:v5.1.1
     volumes:
       - ./configuration/config.js:/usr/share/nginx/html/config/config.js
     links:
@@ -64,16 +64,16 @@ services:
       - formsflow
 
   forms-flow-forms:
-    image: formsflow/forms-flow-forms:v5.1.0
+    image: formsflow/forms-flow-forms:v5.1.1
     restart: always
     environment:
       DEBUG: formio:*
       NODE_CONFIG: "{\"mongo\":\"mongodb://${FORMIO_DB_USERNAME:-admin}:${FORMIO_DB_PASSWORD:-changeme}@forms-flow-forms-db:27017/${FORMIO_DB_NAME:-formio}?authMechanism=SCRAM-SHA-1&authSource=admin\"}"
       ROOT_EMAIL: ${FORMIO_ROOT_EMAIL:[email protected]}
       ROOT_PASSWORD: ${FORMIO_ROOT_PASSWORD:-changeme}
       FORMIO_DOMAIN: ${FORMIO_DEFAULT_PROJECT_URL}
-      FORMIO_CLIENT_UI: ${FORMIO_CLIENT_UI:-false}
       FORMIO_JWT_SECRET: ${FORMIO_JWT_SECRET}
+      NO_INSTALL: ${NO_INSTALL:-1}
     ports:
       - "3001:3001"
     links:
@@ -95,7 +95,7 @@ services:
       - formsflow
 
   forms-flow-bpm:
-    image: formsflow/forms-flow-bpm:v5.1.0
+    image: formsflow/forms-flow-bpm:v5.1.1
     restart: always
     environment:
       - KEYCLOAK_URL=${KEYCLOAK_URL}
@@ -150,7 +150,7 @@ services:
       - formsflow
 
   forms-flow-webapi:
-    image: formsflow/forms-flow-webapi:v5.1.0
+    image: formsflow/forms-flow-webapi:v5.1.1
     restart: always
     links:
       - forms-flow-webapi-db

diff --git a/docker-compose/sample.env b/docker-compose/sample.env
@@ -23,6 +23,7 @@
 ##URL of forms-flow-forms
 FORMIO_DEFAULT_PROJECT_URL=http://{your-ip-address}:3001
 #FORMIO_JWT_SECRET=--- change me now ---
+#NO_INSTALL=1
 
 
     #-----Environment Variables for FormIO Datastore-----#
@@ -40,7 +41,6 @@ FORMIO_DEFAULT_PROJECT_URL=http://{your-ip-address}:3001
 #[email protected]
 ##form.io admin password
 #FORMIO_ROOT_PASSWORD=changeme
-#FORMIO_CLIENT_UI=false
 
 #++++++++++++++++--- FORM.IO ENV Variables - END ---+++++++++++++++++++++++++#
 

diff --git a/scripts/install.bat b/scripts/install.bat
@@ -33,8 +33,26 @@ EXIT /B %ERRORLEVEL%
     call:config ..\docker-compose\configuration
     call:forms-flow-web ..\docker-compose
     call:forms-flow-api ..\docker-compose %~1
+    call:isUp
     EXIT /B 0
 
+
+:: #############################################################
+:: ##################### Check working ########################
+:: #############################################################    
+
+:isUp
+   :Check if the web API is up
+     for /f %%a in ('curl -LI "http://%ip-add%:5000" -o nul -w "%%{http_code}" -s') do set "HTTP=%%a"
+     if "%HTTP%" == "200" (
+       echo formsflow.ai is successfully installed.
+       EXIT /B 0
+     ) else (
+       echo Finishing setup.
+       ping 127.0.0.1 -n 6 >nul
+       goto isUp
+     )
+
 :: #############################################################
 :: ################### Finding IP Address ######################
 :: #############################################################

diff --git a/scripts/uninstall.bash b/scripts/uninstall.bash
@@ -8,6 +8,7 @@ echo "Do you want to uninstall formsflow.ai installation? [y/n]"
 read choice
 if [[ $choice == "y" ]]; then
     cd ../docker-compose
-    docker-compose -p formsflow-ai -f analytics-docker-compose.yml down
-    docker-compose -p formsflow-ai -f $docker_compose_file down
+    docker-compose -f analytics-docker-compose.yml down
+    docker-compose -f $docker_compose_file down
+    docker images | grep "forms-flow" | awk '{print $3}' | xargs docker image rm
 fi
diff --git a/scripts/uninstall.bat b/scripts/uninstall.bat
@@ -72,5 +72,4 @@ EXIT /B %ERRORLEVEL%
 
 :prune-docker
     docker volume prune -f
-    docker system prune
-    docker container prune
+    docker image prune --all -f --filter label=Name="formsflow"