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

[#1674] Add basic DOCKER_ENV logging for run_demo #1675

Merged
merged 2 commits into from
Mar 21, 2022
Merged

[#1674] Add basic DOCKER_ENV logging for run_demo #1675

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd0e51f
[#1674] Add basic DOCKER_ENV logging for run_demo
tdiesler Mar 18, 2022
279b68f
Merge branch 'main' into ghi1674
andrewwhitehead Mar 21, 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
4 changes: 3 additions & 1 deletion demo/run_demo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ if [ -z "$AGENT_ENDPOINT" ] && [ "$RUNMODE" == "docker" ]; then
fi
fi

echo $DOCKERHOST
echo "DOCKERHOST=$DOCKERHOST"

DOCKER_ENV="-e LOG_LEVEL=${LOG_LEVEL} -e RUNMODE=${RUNMODE} -e DOCKERHOST=${DOCKERHOST}"
if ! [ -z "$AGENT_PORT" ]; then
Expand Down Expand Up @@ -241,6 +241,8 @@ if ! [ -z "${ENABLE_PYDEVD_PYCHARM}" ]; then
DOCKER_ENV="${DOCKER_ENV} -e ENABLE_PYDEVD_PYCHARM=${ENABLE_PYDEVD_PYCHARM} -e PYDEVD_PYCHARM_CONTROLLER_PORT=${PYDEVD_PYCHARM_CONTROLLER_PORT} -e PYDEVD_PYCHARM_AGENT_PORT=${PYDEVD_PYCHARM_AGENT_PORT}"
fi

echo "DOCKER_ENV=$DOCKER_ENV"

# on Windows, docker run needs to be prefixed by winpty
if [ "$OSTYPE" = "msys" ]; then
DOCKER="winpty docker"
Expand Down