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.

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

Make docker scripts current directory independent #506

Merged
merged 1 commit into from
Jun 4, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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