Skip to content

Commit 4f98e50

Browse files
bysomeonebysomeone
committed
update docker compose to v2
1 parent c05a4eb commit 4f98e50

File tree

7 files changed

+33
-33
lines changed

7 files changed

+33
-33
lines changed

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818
# TODO: this will hopefully be fixed by
1919
# https://github.com/actions/setup-go/issues/14
2020
export PATH=${PATH}:`go env GOPATH`/bin
21-
go install golang.org/x/tools/cmd/goimports@latest
21+
go install golang.org/x/tools/cmd/goimports@v0.24.0
2222
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.44.2
23-
go install mvdan.cc/sh/cmd/shfmt@latest
24-
go install mvdan.cc/sh/cmd/gosh@latest
23+
go install mvdan.cc/sh/v3/cmd/shfmt@v3.7.0
24+
go install mvdan.cc/sh/v3/cmd/gosh@v3.7.0
2525
2626
- name: Lint
2727
run: |

‎build/autotest/gitlabci/autotest.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,17 @@ function init() {
5454
function start() {
5555

5656
# remove exsit container
57-
docker-compose -p "${PROJECT_NAME}" -f compose-autotest.yml down --remove-orphans
57+
docker compose -p "${PROJECT_NAME}" -f compose-autotest.yml down --remove-orphans
5858

5959
# create and run docker-compose container
60-
docker-compose -p "${PROJECT_NAME}" -f compose-autotest.yml up --build -d
60+
docker compose -p "${PROJECT_NAME}" -f compose-autotest.yml up --build -d
6161

6262
local SLEEP=30
6363
echo "=========== sleep ${SLEEP}s ============="
6464
sleep ${SLEEP}
6565

66-
# docker-compose ps
67-
docker-compose -p "${PROJECT_NAME}" -f compose-autotest.yml ps
66+
# docker compose ps
67+
docker compose -p "${PROJECT_NAME}" -f compose-autotest.yml ps
6868

6969
# query node run status
7070
${CLI} block last_header
@@ -218,7 +218,7 @@ function stop_chain33() {
218218

219219
rv=$?
220220
echo "=========== #stop docker-compose ============="
221-
docker-compose -p "${PROJECT_NAME}" -f compose-autotest.yml down && rm -rf ./chain33* ./*.toml ./autotest
221+
docker compose -p "${PROJECT_NAME}" -f compose-autotest.yml down && rm -rf ./chain33* ./*.toml ./autotest
222222
echo "=========== #remove related images ============"
223223
docker rmi "${PROJECT_NAME}"_autotest || true
224224
exit ${rv}

‎build/autotest/jerkinsci/autotest.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ function config_autotest() {
5858
function start_chain33() {
5959

6060
# create and run docker-compose container
61-
docker-compose -p "${PROJECT_NAME}" -f compose-autotest.yml up --build -d
61+
docker compose -p "${PROJECT_NAME}" -f compose-autotest.yml up --build -d
6262

6363
local SLEEP=2
6464
sleep ${SLEEP}
6565

66-
# docker-compose ps
67-
docker-compose -p "${PROJECT_NAME}" -f compose-autotest.yml ps
66+
# docker compose ps
67+
docker compose -p "${PROJECT_NAME}" -f compose-autotest.yml ps
6868

6969
# query node run status
7070
${CLI} block last_header
@@ -146,7 +146,7 @@ function stop_chain33() {
146146

147147
rv=$?
148148
echo "=========== #stop docker-compose ============="
149-
docker-compose -p "${PROJECT_NAME}" -f compose-autotest.yml down
149+
docker compose -p "${PROJECT_NAME}" -f compose-autotest.yml down
150150
echo "=========== #remove related images ============"
151151
docker rmi "${PROJECT_NAME}"_autotest || true
152152
pwd

‎build/docker-compose-dapp.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,20 +90,20 @@ function base_init() {
9090

9191
function start() {
9292
echo "=========== # docker-compose ps ============="
93-
docker-compose ps
93+
docker compose ps
9494

9595
# remove exsit container
96-
docker-compose down
96+
docker compose down
9797

9898
# create and run docker-compose container
99-
#docker-compose -f docker-compose.yml -f docker-compose-paracross.yml -f docker-compose-relay.yml up --build -d
100-
docker-compose up --build -d
99+
#docker compose -f docker-compose.yml -f docker-compose-paracross.yml -f docker-compose-relay.yml up --build -d
100+
docker compose up --build -d
101101

102102
local SLEEP=30
103103
echo "=========== sleep ${SLEEP}s ============="
104104
sleep ${SLEEP}
105105

106-
docker-compose ps
106+
docker compose ps
107107

108108
# query node run status
109109
${CLI} block last_header

‎build/docker-compose-down.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@ echo "COMPOSE_PROJECT_NAME=$COMPOSE_PROJECT_NAME"
2929

3030
function down() {
3131
echo "=========== # docker-compose ps ============="
32-
docker-compose ps
32+
docker compose ps
3333
# shellchk not recommend the first way
34-
# remains=( $(docker-compose ps -q | awk '{print $1}') )
35-
mapfile -t remains < <(docker-compose ps -q | awk '{print $1}')
34+
# remains=( $(docker compose ps -q | awk '{print $1}') )
35+
mapfile -t remains < <(docker compose ps -q | awk '{print $1}')
3636
# shellcheck disable=SC2154
3737
num=${#remains[@]}
3838
echo "container num=$num"
3939
if [ "$num" -gt 0 ]; then
4040
# remove exsit container
4141
echo "=========== # docker-compose down ============="
42-
docker-compose down --rmi local
42+
docker compose down --rmi local
4343
fi
4444

4545
}

‎build/docker-compose.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,20 +123,20 @@ function consens_init() {
123123
}
124124
function start() {
125125
echo "=========== # docker-compose ps ============="
126-
docker-compose ps
126+
docker compose ps
127127

128128
# remove exsit container
129-
docker-compose down
129+
docker compose down
130130

131131
# create and run docker-compose container
132132
#docker-compose -f docker-compose.yml -f docker-compose-paracross.yml -f docker-compose-relay.yml up --build -d
133-
docker-compose up --build -d
133+
docker compose up --build -d
134134

135135
local SLEEP=5
136136
echo "=========== sleep ${SLEEP}s ============="
137137
sleep ${SLEEP}
138138

139-
docker-compose ps
139+
docker compose ps
140140

141141
# query node run status
142142
check_docker_status
@@ -206,10 +206,10 @@ function start() {
206206
}
207207

208208
function check_docker_status() {
209-
status=$(docker-compose ps | grep chain33_1 | awk '{print $6}')
209+
status=$(docker compose ps | grep chain33_1 | awk '{print $6}')
210210
if [ "${status}" == "Exit" ]; then
211211
echo "=========== chain33 service Exit logs ========== "
212-
docker-compose logs chain33
212+
docker compose logs chain33
213213
echo "=========== chain33 service Exit logs End========== "
214214
fi
215215

‎build/system-fork-test.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,21 +90,21 @@ function base_init() {
9090
}
9191

9292
function start() {
93-
# docker-compose ps
94-
docker-compose ps
93+
94+
docker compose ps
9595

9696
# remove exsit container
97-
docker-compose down
97+
docker compose down
9898

9999
# create and run docker-compose container
100-
# docker-compose -f docker-compose.yml -f docker-compose-para.yml up --build -d
101-
docker-compose up --build -d
100+
# docker compose -f docker-compose.yml -f docker-compose-para.yml up --build -d
101+
docker compose up --build -d
102102

103103
local SLEEP=30
104104
echo "=========== sleep ${SLEEP}s ============="
105105
sleep ${SLEEP}
106106

107-
docker-compose ps
107+
docker compose ps
108108

109109
# query node run status
110110

0 commit comments

Comments
 (0)