Skip to content

Commit

Permalink
@#295 | fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
datphan committed Jul 13, 2017
1 parent 482593a commit eebb772
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions main-cookbooks/teracy-dev/recipes/docker_registry.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

if docker_conf['enabled'] == true
execute 'rm ~/.docker/config.json' do
command "rm /home/vagrant/.docker/config.json || true"
command 'rm /home/vagrant/.docker/config.json || true'
only_if {
docker_registry_conf['force'] == true and
File.exist?('/home/vagrant/.docker/config.json')
Expand All @@ -19,9 +19,9 @@
docker_registry_conf['entries'].each.with_index do |entry, index|
# private registry login

username = entry['username'] ? entry['username'] : ""
username = entry['username'] ? entry['username'] : ''

password = entry['password'] ? entry['password'] : ""
password = entry['password'] ? entry['password'] : ''

if not username.empty? and not password.empty?
opt = [
Expand All @@ -41,7 +41,7 @@
end

execute 'copy /root/.docker/config.json to ~/.docker/config.json' do
command "cp /root/.docker/config.json /home/vagrant/.docker/config.json"
command 'cp /root/.docker/config.json /home/vagrant/.docker/config.json'
only_if {
File.exist?('/root/.docker/config.json') and (
docker_registry_conf['force'] == true or
Expand Down

0 comments on commit eebb772

Please sign in to comment.