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

loosening serverspec image matching to allow for tags #192

Merged
merged 1 commit into from
Jul 23, 2014
Merged

loosening serverspec image matching to allow for tags #192

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
8 changes: 5 additions & 3 deletions test/shared/support/docker_container.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,14 @@ def find_container
containers = Docker::Container.all(:all => true)
containers.each do |container|
if @command == nil
if container.info['Image'] == @image
if container.info['Image'] == @image || container.info['Image'].split(':').first == @image
return container
end
else
if container.info['Command'] == @command && container.info['Image'] == @image
return container
if container.info['Command'] == @command
if container.info['Image'] == @image || container.info['Image'].split(':').first == @image
return container
end
end
end
end
Expand Down