From efd811432bc51dc9b647646e71b53b7d4b0cc8b2 Mon Sep 17 00:00:00 2001
From: Lee Bousfield <ljbousfield@gmail.com>
Date: Sun, 4 Jun 2017 02:30:42 -0600
Subject: [PATCH] merging PR #506: Make docker scripts current directory
 independent

https://github.com/chaosbot/Chaos/pull/506: Make docker scripts current directory independent

Description:
Instead of `cd dev/docker; sudo ./run.sh` this allows `sudo dev/docker/run.sh`.

:white_check_mark: PR passed with a vote of 8 for and 0 against, a weighted total of 8.0 and a threshold of 6.5, and a current meritocracy review.

Vote record:
@PlasmaPower: 1
@amoffat: 1
@andrewda: 1
@anythingbot: 1
@e-beach: 1
@eukaryote31: 1
@justync7: 1
@rhengles: 1
---
 dev/docker/build.bat | 1 +
 dev/docker/build.sh  | 2 ++
 dev/docker/run.bat   | 2 +-
 dev/docker/run.sh    | 1 +
 dev/docker/test.bat  | 2 +-
 dev/docker/test.sh   | 1 +
 6 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/dev/docker/build.bat b/dev/docker/build.bat
index ca69012a..b3115b33 100644
--- a/dev/docker/build.bat
+++ b/dev/docker/build.bat
@@ -1,3 +1,4 @@
+cd %~dp0
 copy ..\..\requirements.txt .
 docker build -t chaos .
 del requirements.txt
diff --git a/dev/docker/build.sh b/dev/docker/build.sh
index b4bc46a6..ae47c0dc 100755
--- a/dev/docker/build.sh
+++ b/dev/docker/build.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+cd "$(dirname "$0")"
+
 while getopts ":rpi:" opt; do
 	case $opt in
 		\?)
diff --git a/dev/docker/run.bat b/dev/docker/run.bat
index 18db7ea8..7ca3105d 100644
--- a/dev/docker/run.bat
+++ b/dev/docker/run.bat
@@ -1,2 +1,2 @@
-cd ..\..\
+cd %~dp0\..\..\
 docker run -it --rm -v %cd%:/root/workspace/Chaos -p 8082:80 -p 8081:8081 chaos bash /root/workspace/Chaos/dev/docker/start_services.sh
diff --git a/dev/docker/run.sh b/dev/docker/run.sh
index 4f2c7197..0902cd25 100755
--- a/dev/docker/run.sh
+++ b/dev/docker/run.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+cd "$(dirname "$0")"
 docker run -it --rm\
     -v $(cd ../../; pwd):/root/workspace/Chaos\
     -p 8082:80\
diff --git a/dev/docker/test.bat b/dev/docker/test.bat
index 19ffc46b..d6998740 100644
--- a/dev/docker/test.bat
+++ b/dev/docker/test.bat
@@ -1,2 +1,2 @@
-cd ..\..\
+cd %~dp0\..\..\
 docker run -it --rm -v %cd%:/root/workspace/Chaos -p 8082:80 -p 8081:8081 chaos bash /root/workspace/Chaos/dev/docker/start_tests.sh
diff --git a/dev/docker/test.sh b/dev/docker/test.sh
index 32232325..277fd462 100755
--- a/dev/docker/test.sh
+++ b/dev/docker/test.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+cd "$(dirname "$0")"
 docker run -it --rm\
     -v $(cd ../../; pwd):/root/workspace/Chaos\
     -p 8082:80\