From 4d8c670161ad32b43bab112125d78db8b19b7975 Mon Sep 17 00:00:00 2001
From: Sergey Uzinger <85581004+sseuzss@users.noreply.github.com>
Date: Mon, 5 Dec 2022 14:17:44 +0500
Subject: [PATCH] Fix build and upload modules (#4)

* Fix upload modules

* Disable latest tag for git tags

* Fix CRLF to LF
---
 .github/actions/docker_build/action.yml |  3 ++-
 startup.sh                              | 25 +++++++++++++++----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/.github/actions/docker_build/action.yml b/.github/actions/docker_build/action.yml
index 9e3186a..aa30145 100644
--- a/.github/actions/docker_build/action.yml
+++ b/.github/actions/docker_build/action.yml
@@ -28,9 +28,10 @@ runs:
           docker.io/vxcontrol/${{ inputs.docker_name }}
         tags: |
           type=ref,event=branch
+          type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
           type=semver,pattern={{version}}
         flavor: |
-          latest=true
+          latest=false
 
     - name: Setup Docker Buildx
       uses: docker/setup-buildx-action@v2
diff --git a/startup.sh b/startup.sh
index d0ff8a8..a27e6b2 100644
--- a/startup.sh
+++ b/startup.sh
@@ -50,16 +50,21 @@ while true; do
 done
 
 # update modules base columns into global DB
-mysql -h"$DB_HOST" -P"$DB_PORT" -u"$DB_USER" -p"$DB_PASS" "$DB_NAME" < /opt/vxmodules/dump_global.sql
-echo "base updating of modules into global DB complete"
-mysql -h"$DB_HOST" -P"$DB_PORT" -u"$DB_USER" -p"$DB_PASS" "$DB_NAME" < /opt/vxmodules/dump_global_sec_cfg.sql
-echo "updating of modules secure config into global DB was complete"
-
-echo "done"
-
-GET_MODULES="SELECT name from modules;"
-MODULES=$(mysql -h"$DB_HOST" -P"$DB_PORT" -u"$DB_USER" -p"$DB_PASS" "$DB_NAME" -Nse "$GET_MODULES" 2>/dev/null)
-echo "List of modules in database: $MODULES"
+while true; do
+  mysql -h"$DB_HOST" -P"$DB_PORT" -u"$DB_USER" -p"$DB_PASS" "$DB_NAME" < /opt/vxmodules/dump_global.sql
+  echo "base updating of modules into global DB complete"
+  mysql -h"$DB_HOST" -P"$DB_PORT" -u"$DB_USER" -p"$DB_PASS" "$DB_NAME" < /opt/vxmodules/dump_global_sec_cfg.sql
+  echo "updating of modules secure config into global DB was complete"
+  GET_MODULES="SELECT name from modules;"
+  MODULES=$(mysql -h"$DB_HOST" -P"$DB_PORT" -u"$DB_USER" -p"$DB_PASS" "$DB_NAME" -Nse "$GET_MODULES" 2>/dev/null)
+  echo "List of modules in database: $MODULES"
+  if [[ -n $MODULES ]]; then
+        echo "Modules uploaded to database"
+        break
+    fi
+    echo "failed to update global modules table"
+    sleep 1
+done
 
 
 sleep infinity