Skip to content

Commit

Permalink
merging PR Chaosthebot#506: Make docker scripts current directory ind…
Browse files Browse the repository at this point in the history
…ependent

Chaosthebot#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
  • Loading branch information
PlasmaPower authored and chaosbot committed Jun 4, 2017
1 parent 6a0ec8a commit efd8114
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 2 deletions.
1 change: 1 addition & 0 deletions dev/docker/build.bat
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
cd %~dp0
copy ..\..\requirements.txt .
docker build -t chaos .
del requirements.txt
2 changes: 2 additions & 0 deletions dev/docker/build.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/bin/bash

cd "$(dirname "$0")"

while getopts ":rpi:" opt; do
case $opt in
\?)
Expand Down
2 changes: 1 addition & 1 deletion dev/docker/run.bat
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions dev/docker/run.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/bin/bash
cd "$(dirname "$0")"
docker run -it --rm\
-v $(cd ../../; pwd):/root/workspace/Chaos\
-p 8082:80\
Expand Down
2 changes: 1 addition & 1 deletion dev/docker/test.bat
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions dev/docker/test.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/bin/bash
cd "$(dirname "$0")"
docker run -it --rm\
-v $(cd ../../; pwd):/root/workspace/Chaos\
-p 8082:80\
Expand Down

0 comments on commit efd8114

Please sign in to comment.