From: Sam Saffron Date: Mon, 25 Nov 2013 01:34:41 +0000 (-0800) Subject: don't use tags cause they collide X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=5efded6a576626d1715405c681ece6eac5c0a7da;p=discourse_docker.git don't use tags cause they collide --- diff --git a/launcher b/launcher index 9967a9e..7b7369a 100755 --- a/launcher +++ b/launcher @@ -5,6 +5,7 @@ config=$2 config_file="$config".yml cidfile=cids/"$config".cid cidbootstrap=cids/"$config"_boostrap.cid +local_discourse=local_discourse image=samsaffron/discourse docker_path=`which docker` @@ -74,7 +75,7 @@ case "$command" in exec echo "$input" | docker run -cidfile $cidbootstrap -i -a stdin -a stdout -a stderr $volumes $image /pups/bin/pups --stdin sleep 10 - docker commit `cat $cidbootstrap` $image:$config || echo 'FAILED TO COMMIT' + docker commit `cat $cidbootstrap` $local_discourse/$config || echo 'FAILED TO COMMIT' docker rm `cat $cidbootstrap` && rm $cidbootstrap exit 0 ;; @@ -125,7 +126,7 @@ case "$command" in set_volumes - docker run -name $config -cidfile $cidfile $ports -d $volumes $image:$config /usr/bin/runsvdir -P /etc/service + docker run -name $config -cidfile $cidfile $ports -d $volumes $local_discourse/$config /usr/bin/runsvdir -P /etc/service exit 0 else echo "cid found, ensuring container is started"