Merge pull request #1823 from HXSecurity/develop

v1.15.0
HXSecurity · Sep 17, 2023 · ce02f7d · ce02f7d
2 parents 392336c + b52c452
commit ce02f7d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/deploy/docker-compose/dtctl b/deploy/docker-compose/dtctl
@@ -1281,7 +1281,7 @@ if [ ! 0 == $# ]; then # If options provided then
       done
       # extract sql name and reverse list
       if [[ $(first_gt_second $TO_VERSION 1.9.0) == true ]]; then
-        SQL_NAMES=$(docker exec -i $mysql_container_id /bin/bash -c "cat /schema/updaterecord.txt" | awk "/${TO_VERSION//./\\.}/,/${FROM_VERSION//./\\.}/ {print \$2}" | grep -vF "$FROM_VERSION" | awk "{array[NR]=\$0} END { for(i=NR;i>0;i--) {print array[i];} }")
+        SQL_NAMES=$(docker exec -i $mysql_container_id /bin/bash -c "cat /schema/updaterecord.txt" | awk "/${TO_VERSION//./\\.}/,/${FROM_VERSION//./\\.}/ {print \$2}" | grep -vF "$FROM_VERSION" | awk "{array[NR]=\$0} END { for(i=NR;i>0;i--) {print array[i];} }") || true
       else
         SQL_NAMES=$(cat updaterecord.txt | awk "/${TO_VERSION//./\\.}/,/${FROM_VERSION//./\\.}/ {print \$2}" | grep -vF "$FROM_VERSION" | awk "{array[NR]=\$0} END { for(i=NR;i>0;i--) {print array[i];} }")
       fi
@@ -1312,7 +1312,7 @@ if [ ! 0 == $# ]; then # If options provided then
         docker run -i --name dongtai-server-update -v $PWD/config-tutorial.ini:/opt/dongtai/dongtai_conf/conf/config.ini --rm \
           --link `docker ps | grep dongtai-mysql | awk '{print $1}'`:dongtai-mysql \
           --link `docker ps | grep dongtai-redis | awk '{print $1}'`:dongtai-redis \
-          --network dongtainetwork $registry/dongtai-server:$TO_VERSION migrate || exit 1
+          --network dongtainetwork $(get_image_registry 2)/dongtai-server:$TO_VERSION migrate || exit 1
       fi
 
       if [ $TO_VERSION = 1.8.0 ]; then