projects
/
discourse_docker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FIX: properly shut down services on "docker stop"
[discourse_docker.git]
/
launcher
diff --git
a/launcher
b/launcher
index 797c58c9329bd45fa41884aa3475db0d37caeb55..c39d8a97f6e5f2c3d22aae6ab3ca4b3d375d5aef 100755
(executable)
--- a/
launcher
+++ b/
launcher
@@
-13,7
+13,7
@@
config_file=containers/"$config".yml
cidfile=cids/"$config".cid
cidbootstrap=cids/"$config"_boostrap.cid
local_discourse=local_discourse
cidfile=cids/"$config".cid
cidbootstrap=cids/"$config"_boostrap.cid
local_discourse=local_discourse
-image=samsaffron/discourse:1.0.
4
+image=samsaffron/discourse:1.0.
5
docker_path=`which docker.io || which docker`
if [ "${SUPERVISED}" = "true" ]; then
docker_path=`which docker.io || which docker`
if [ "${SUPERVISED}" = "true" ]; then
@@
-340,7
+340,7
@@
run_start(){
fi
$docker_path run $links $attach_on_run $restart_policy "${env[@]}" -h "`hostname`-$config" -e DOCKER_HOST_IP=$docker_ip --name $config -t --cidfile $cidfile $ports \
fi
$docker_path run $links $attach_on_run $restart_policy "${env[@]}" -h "`hostname`-$config" -e DOCKER_HOST_IP=$docker_ip --name $config -t --cidfile $cidfile $ports \
- $volumes $local_discourse/$config /sbin/
runi
t
+ $volumes $local_discourse/$config /sbin/
boo
t
exit 0
else
exit 0
else