From b7e0e241bac3b0d158f8accf5cdb55c8b8f788fb Mon Sep 17 00:00:00 2001 From: Eimhin Laverty Date: Tue, 28 May 2019 16:28:10 +0100 Subject: [PATCH] (MODULES-9177) Fix version validation regex The regexes used in init.pp assumed that the supplied docker version would have to start with 17, however docker is now at 18. --- manifests/init.pp | 2 +- spec/classes/docker_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 1ccbbc0c..2a986dbd 100755 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -594,7 +594,7 @@ } } - if ( $version == undef ) or ( $version !~ /^(17[.]0[0-5][.][0-1](~|-|\.)ce|1.\d+)/ ) { + if ( $version == undef ) or ( $version !~ /^(1[7-8][.][0-1][0-9][.][0-1](~|-|\.)ce|1.\d+)/ ) { if ( $docker_ee) { $package_location = $docker::docker_ee_source_location $package_key_source = $docker::docker_ee_key_source diff --git a/spec/classes/docker_spec.rb b/spec/classes/docker_spec.rb index 09558d1a..fa3678de 100755 --- a/spec/classes/docker_spec.rb +++ b/spec/classes/docker_spec.rb @@ -847,11 +847,11 @@ it { is_expected.to contain_file(service_config_file).with_content(%r{-g \/mnt\/docker}) } end - context 'with custom root dir && Docker version > 17.05' do + context 'with custom root dir && Docker version > 18.09' do let(:params) do { 'root_dir' => '/mnt/docker', - 'version' => '18.03', + 'version' => '19.09', } end