FIX: on bootup ensure correct shared structure

[discourse_docker.git] / launcher

diff --git a/launcher b/launcher
index 8f7268272d84f00ac84116f9bab9dab268c39a80..bc7f2041f4fca25a758317bf8bb8010ba34c0295 100755 (executable)
--- a/launcher
+++ b/launcher
@@ -6,8 +6,8 @@ opt=$3
 
 cd "$(dirname "$0")"
 
-docker_min_version='0.9.1'
-docker_rec_version='0.11.1'
+docker_min_version='1.2.0'
+docker_rec_version='1.2.0'
 
 config_file=containers/"$config".yml
 cidfile=cids/"$config".cid
@@ -245,7 +245,7 @@ if compare_version "1.2.0" "$docker_version"; then
   echo "We recommend you upgrade docker, the version you are running has no restart policies, on reboot your container may not start up"
   restart_policy=""
 else
-  restart_policy="--restart=always "
+  restart_policy="--restart=always"
 fi
 
 
@@ -286,12 +286,7 @@ run_start(){
          exit 1
        fi
 
-       run="run"
-       if [ -n "${restart_policy}" ]; then
-          run="$run $restart_policy"
-       fi
-
-       $docker_path $run "${env[@]}" -h "`hostname`-$config" -e DOCKER_HOST_IP=$docker_ip --name $config -t --cidfile $cidfile $ports \
+       $docker_path run $restart_policy "${env[@]}" -h "`hostname`-$config" -e DOCKER_HOST_IP=$docker_ip --name $config -t --cidfile $cidfile $ports \
                   -d $volumes $local_discourse/$config /sbin/runit
 
        exit 0