Skip to content

Commit 276a069

Browse files
committed
ci:fix scripts compatibility for docker upgrade
1 parent 1c80070 commit 276a069

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

build/docker-compose.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ set -o pipefail
1515
PWD=$(cd "$(dirname "$0")" && pwd)
1616
export PATH="$PWD:$PATH"
1717

18-
NODE3="${1}_chain33_1"
18+
NODE3="${1}-chain33-1"
1919
CLI="docker exec ${NODE3} /root/chain33-cli"
2020

21-
NODE2="${1}_chain32_1"
21+
NODE2="${1}-chain32-1"
2222

23-
NODE1="${1}_chain31_1"
23+
NODE1="${1}-chain31-1"
2424

25-
NODE4="${1}_chain30_1"
25+
NODE4="${1}-chain30-1"
2626

27-
NODE5="${1}_chain29_1"
27+
NODE5="${1}-chain29-1"
2828
CLI5="docker exec ${NODE5} /root/chain33-cli"
2929

3030
containers=("${NODE1}" "${NODE2}" "${NODE3}" "${NODE4}")
@@ -206,8 +206,8 @@ function start() {
206206
}
207207

208208
function check_docker_status() {
209-
status=$(docker compose ps | grep chain33_1 | awk '{print $6}')
210-
if [ "${status}" == "Exit" ]; then
209+
res=$(docker compose ps | grep chain33-1 )
210+
if grep -q Exit <<< "$res"; then
211211
echo "=========== chain33 service Exit logs ========== "
212212
docker compose logs chain33
213213
echo "=========== chain33 service Exit logs End========== "

build/docker-compose.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
version: '3'
21

32
services:
43
chain33:

0 commit comments

Comments
 (0)