From 69545efdbae1d5e8474910e3816694ce80b92dbd Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Wed, 20 Apr 2016 11:42:29 -0700 Subject: [PATCH] remove docker 1.2 references, we block on any version under 1.6 anyway --- launcher | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/launcher b/launcher index 14b8280..d4ef75a 100755 --- a/launcher +++ b/launcher @@ -120,8 +120,6 @@ prereqs() { test=($($docker_path --version)) # Get docker version string test=${test[2]//,/} # Get version alone and strip comma if exists - [[ "$test" =~ "0.12.0" ]] && echo "You are running a broken version of Docker, please upgrade ASAP. See: https://meta.discourse.org/t/the-installation-stopped-in-the-middle/16311/ for more details." && exit 1 - # At least minimum version if compare_version "${docker_min_version}" "${test}"; then echo "ERROR: Docker version ${test} not supported, please upgrade to at least ${docker_min_version}, or recommended ${docker_rec_version}" @@ -406,13 +404,7 @@ fi docker_version=($($docker_path --version)) docker_version=${test[2]//,/} - -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_policy:---restart=always} -fi +restart_policy=${restart_policy:---restart=always} set_existing_container(){ existing=`$docker_path ps -a | awk '{ print $1, $(NF) }' | grep " $config$" | awk '{ print $1 }'` -- 2.25.1