Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removing call to image_id_matches in load_current_resource #154

Closed
wants to merge 1 commit into from
Closed

Removing call to image_id_matches in load_current_resource #154

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions providers/image.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@ def load_current_resource
if dimages.stdout.include?(new_resource.image_name)
dimages.stdout.each_line do |di_line|
image = di(di_line)
unless image_id_matches?(image['id'])
next unless image_name_matches?(image['repository'])
next unless image_tag_matches_if_exists?(image['tag'])
end
next unless image_name_matches?(image['repository'])
next unless image_tag_matches_if_exists?(image['tag'])
Chef::Log.debug('Matched docker image: ' + di_line.squeeze(' '))
@current_resource.created(image['created'])
@current_resource.repository(image['repository'])
Expand Down