Skip to content

Commit

Permalink
Merge pull request #221 from nicolasbigler/fix/puppet4_incompatibility
Browse files Browse the repository at this point in the history
Fix incompatiblity with puppet4
  • Loading branch information
davejrt authored Apr 27, 2018
2 parents 22f031e + 09553cf commit 534626b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion manifests/registry.pp
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
$docker_command = $docker::params::docker_command

if $ensure == 'present' {
if $username != undef and $password != undef and $email != undef and $version =~ /1[.][1-9]0?/ {
if $username != undef and $password != undef and $email != undef and $version != undef and $version =~ /1[.][1-9]0?/ {
$auth_cmd = "${docker_command} login -u '${username}' -p \"\${password}\" -e '${email}' ${server}"
$auth_environment = "password=${password}"
}
Expand Down

0 comments on commit 534626b

Please sign in to comment.