From c3ad5d40aec2bd879cb9a481a00ed23f88a63f79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emiliano=20Su=C3=B1=C3=A9?= Date: Fri, 31 Jan 2020 15:16:33 -0800 Subject: [PATCH 1/2] Tweaks to run_docker script for windows bash compatibility MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Emiliano Suñé --- scripts/run_docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/run_docker b/scripts/run_docker index 72fc4e9693..41e8ca339d 100755 --- a/scripts/run_docker +++ b/scripts/run_docker @@ -20,7 +20,7 @@ if [ ! -z "${ENABLE_PTVSD}" ]; then ARGS="${ARGS} -e ENABLE_PTVSD=\"${ENABLE_PTVSD}\" -p $PTVSD_PORT:$PTVSD_PORT" fi -ARGS="${ARGS} -v `pwd`/../logs:/home/indy/logs" +ARGS="${ARGS} -v /$(pwd)/../logs:/home/indy/logs" if [ ! -z "${WEBHOOK_URL}" ]; then ARGS="${ARGS} -e WEBHOOK_URL=\"${WEBHOOK_URL}\"" From 723b472a44107506aac2dcc4ff40b705b1a5fc3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emiliano=20Su=C3=B1=C3=A9?= Date: Mon, 3 Feb 2020 14:42:37 -0800 Subject: [PATCH 2/2] Update volume mount in run_demo, update .gitattributes to enforce line endings in run_demo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Emiliano Suñé --- .gitattributes | 1 + demo/run_demo | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index cc1a6b693d..066a405e68 100644 --- a/.gitattributes +++ b/.gitattributes @@ -8,3 +8,4 @@ *.conf text eol=lf **/bin/* text eol=lf scripts/* text eol=lf +demo/run_demo text eol=lf diff --git a/demo/run_demo b/demo/run_demo index a877007998..6627b8a7d2 100755 --- a/demo/run_demo +++ b/demo/run_demo @@ -84,6 +84,6 @@ DOCKER=${DOCKER:-docker} echo "Starting $AGENT..." $DOCKER run --name $AGENT --rm -it \ -p 0.0.0.0:$AGENT_PORT_RANGE:$AGENT_PORT_RANGE \ - -v `pwd`/../logs:/home/indy/logs \ + -v "/$(pwd)/../logs:/home/indy/logs" \ $DOCKER_ENV \ faber-alice-demo $AGENT_MODULE --port $AGENT_PORT $@