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

Fixed bug in run_demo script #1982

Merged
merged 2 commits into from
Oct 18, 2022
Merged

Fixed bug in run_demo script #1982

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2777d02
fixed issue when passing debug options through the run_demo script
pasquale95 Oct 18, 2022
5e567ad
Merge branch 'hyperledger:main' into feature/fix_debug_options_demo
pasquale95 Oct 18, 2022
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
8 changes: 5 additions & 3 deletions demo/run_demo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ if [ -z "$DOCKER_NET" ]; then
fi
DOCKER_VOL=""

j=1
for i in "$@"
do
((j++))
if [ ! -z "$SKIP" ]; then
SKIP=""
continue
Expand Down Expand Up @@ -65,12 +67,12 @@ do
continue
;;
--debug-pycharm-controller-port)
PYDEVD_PYCHARM_CONTROLLER_PORT=$2
PYDEVD_PYCHARM_CONTROLLER_PORT=${!j}
SKIP=1
continue
;;
--debug-pycharm-agent-port)
PYDEVD_PYCHARM_AGENT_PORT=$2
PYDEVD_PYCHARM_AGENT_PORT=${!j}
SKIP=1
continue
;;
Expand Down Expand Up @@ -154,7 +156,7 @@ if [ ! -z "$DOCKERHOST" ]; then
export RUNMODE="docker"
elif [ -z "${PWD_HOST_FQDN}" ]; then
# getDockerHost; for details refer to https://github.com/bcgov/DITP-DevOps/tree/main/code/snippets#getdockerhost
. /dev/stdin <<<"$(cat <(curl -s --raw https://raw.githubusercontent.com/bcgov/DITP-DevOps/main/code/snippets/getDockerHost))"
. /dev/stdin <<<"$(cat <(curl -s --raw https://raw.githubusercontent.com/bcgov/DITP-DevOps/main/code/snippets/getDockerHost))"
export DOCKERHOST=$(getDockerHost)
export RUNMODE="docker"
else
Expand Down