Merge pull request garethr#331 from hunner/fix_spec

Fix spec for platforms with docker 1.7
vjekoslav · Aug 21, 2015 · 43947b2 · 43947b2
2 parents a6cdbf6 + 13fd97e
commit 43947b2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/spec/acceptance/docker_spec.rb b/spec/acceptance/docker_spec.rb
@@ -105,7 +105,7 @@ class { 'docker':
       registry_port = 5000
       @registry_address = "#{registry_host}:#{registry_port}"
       @registry_email = '[email protected]'
-      @config_file = fact('osfamily') == 'RedHat' ? '~/.dockercfg' : '~/.docker/config.json'
+      @config_file = shell('docker --version|cut -d"/" -f2') > "1.7" ? '~/.dockercfg' : '~/.docker/config.json'
       @manifest = <<-EOS
         class { 'docker': }
         docker::run { 'registry':