Merge pull request #489 from eimlav/modules-9177

(MODULES-9177) Fix version validation regex

Author: sheenaajay

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

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