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

fix: Fix unbound variable in cleanup function in start.sh #483

Merged
merged 1 commit into from
Nov 29, 2023
Merged

fix: Fix unbound variable in cleanup function in start.sh #483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/docker-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
load: true

- name: Test
timeout-minutes: 3
timeout-minutes: 2
working-directory: docker/${{ matrix.docker_image }}
run: ./test.sh

Expand Down
11 changes: 9 additions & 2 deletions docker/common/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,16 @@ export BEACON_BACKEND=${BEACON_BACKEND:-mock}
OASIS_NODE_SOCKET=${OASIS_NODE_DATADIR}/net-runner/network/client-0/internal.sock
OASIS_KM_SOCKET=${OASIS_NODE_DATADIR}/net-runner/network/keymanager-0/internal.sock

OASIS_WEB3_GATEWAY_PID=""
OASIS_NODE_PID=""

function cleanup {
kill -9 $OASIS_WEB3_GATEWAY_PID
kill -9 $OASIS_NODE_PID
if [[ -n "${OASIS_WEB3_GATEWAY_PID}" ]]; then
kill -9 ${OASIS_WEB3_GATEWAY_PID}
fi
if [[ -n "${OASIS_NODE_PID}" ]]; then
kill -9 ${OASIS_NODE_PID}
fi
}

trap cleanup INT TERM EXIT
Expand Down
Loading