From 71464f7e3dbbc01c5983cb38533df6ce70438996 Mon Sep 17 00:00:00 2001 From: zhangsz Date: Thu, 13 Feb 2025 15:27:08 +0800 Subject: [PATCH] feat: setup contain upgrade db --- bin/copy.sh | 1 + build/bin/wfcsetup.sh | 17 ++++++++++++++++- build/bin/wfcupgdb.sh | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/bin/copy.sh b/bin/copy.sh index fc7db54..56ec32d 100755 --- a/bin/copy.sh +++ b/bin/copy.sh @@ -21,6 +21,7 @@ echo -n "Begin copy sql ... " cp ${BERootDir}/sql/wfc_config_db/wfc_config_db.sql ${BuildDockerDir}/mysql/db cp ${BERootDir}/sql/wfc_system_db/wfc_system_db.sql ${BuildDockerDir}/mysql/db cp ${BERootDir}/sql/wfc_user_db/wfc_user_db.sql ${BuildDockerDir}/mysql/db +rm -rf ${BuildDockerDir}/mysql/db/upgrade/* cp -rf ${BERootDir}/sql/upgrade ${BuildDockerDir}/mysql/db/ #ln -sf /tmp ${BuildDockerDir}/mysql/ echo "done" diff --git a/build/bin/wfcsetup.sh b/build/bin/wfcsetup.sh index b1f22cc..a1e510d 100755 --- a/build/bin/wfcsetup.sh +++ b/build/bin/wfcsetup.sh @@ -141,6 +141,19 @@ case "$1" in fi done ;; + upgdb) + CONTAINER_NAME="wfc-mysql" + # upgrade database + cd ${docker_work_dir} + docker-compose up -d wfc-mysql + sleep 10 + if docker ps --filter "name=$CONTAINER_NAME" --format "{{.Names}}" | grep -q "$CONTAINER_NAME"; then + echo "Upgrade database: " + ${wfc_work_dir}/bin/wfcupgdb.sh all + else + echo "Contaier $CONTAINER_NAME not run, please run first..." + fi + ;; base) # build docker compose cd ${docker_work_dir} @@ -175,6 +188,7 @@ case "$1" in $0 base $0 jar $0 fe + $0 upgdb ;; rm) case "$2" in @@ -244,9 +258,10 @@ case "$1" in ;; *) echo "WANFi Control and Billing Management System Setup ... " - echo "Usage: $0 env|initdb|base|jar|modules|fe|all|rm [base|jar|modules|fe|network|all]|prune" + echo "Usage: $0 env|initdb|upgdb|base|jar|modules|fe|all|rm [base|jar|modules|fe|network|all]|prune" echo " $0 env [IP]" echo " $0 initdb" + echo " $0 upgdb" echo " $0 base|jar|modules|fe" echo " $0 all [IP]" echo " $0 rm [base|jar|modules|fe|network|all]" diff --git a/build/bin/wfcupgdb.sh b/build/bin/wfcupgdb.sh index d893a26..7e45e0d 100755 --- a/build/bin/wfcupgdb.sh +++ b/build/bin/wfcupgdb.sh @@ -60,7 +60,7 @@ case "$1" in $0 config ;; *) - echo "WANFi Control and Billing Management System Upgrade Database ..." + echo "WANFi Control and Billing System Upgrade Database ..." echo "Usage: $0 system|user|config|all" exit 1 ;;