Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

v1.15.0 #1823

Merged
merged 2 commits into from
Sep 17, 2023
Merged

v1.15.0 #1823

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13d34c2
feat: update ci
tscuite Sep 17, 2023
b52c452
Merge pull request #1822 from tscuite/develop
tscuite Sep 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions deploy/docker-compose/dtctl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading