foreman_docker 2.1.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca765fa935bb364c2d3f7fbb17fd066eeed01a8f
-  data.tar.gz: d488dee47746e6805e40ed8e84d4fadc2d75a84e
+  metadata.gz: 26d60710f8feff575f0ad158fe70dcd4ca943a4b
+  data.tar.gz: c2cb12599647a844761982076c1b8b176d5c378e
 SHA512:
-  metadata.gz: c9b6bf889814e3b29f09b3ae11fb263a08ccdfa8e468eff22daec5c164b2f89e120fc05d732865926ae11a397406bca4bab2d49844b9461c042be7b303ffb5fa
-  data.tar.gz: 934ba8ca1909f47ed825ad23f8e984d01a5827f538eb41b84e7ec379df3bd2f94a7f93828ba731aaba900ced7e59843b49d001a0f05a2be3e9eb3fdc61d6346b
+  metadata.gz: 96ad25c6bd9fa70731aaa122c26d4515e6094162bd0b998b88b0d64d5f5cd1bc420b21f932ea624c65b5fb9410030a232d5e6dc0c587321b0e4952717f4abd18
+  data.tar.gz: 1e1853fbe2f9f8ce9ecf4f3b8811d7cd0a2a2fbf0afa43298662607559f0cbf7e0d143de93e4c384ce7e16a393aaf157bca069d408c5b931364205aa468860e2

data/README.md

@@ -84,7 +84,8 @@ That's it. You're now ready to create and manage containers in your new Docker c
 | ---------------:| --------------:|
 | >= 1.5         | 0.0.1 - 0.0.3   |
 | >= 1.6         | 0.1.0 - 0.2.0   |
-| >= 1.7         | 1.0.0+          |
+| >= 1.7         | 1.0.0 - 2.1.1   |
+| >= 1.7         | 3.0.0+          |
 
 See extras/RELEASE.md for more detailed information on compatibility and releases.
 

data/app/controllers/api/v2/registries_controller.rb

@@ -1,6 +1,7 @@
 module Api
   module V2
     class RegistriesController < ::Api::V2::BaseController
+      include Foreman::Controller::Parameters::DockerRegistry
       before_filter :find_resource, :except => %w(index create)
 
       resource_description do
@@ -12,6 +13,7 @@ module Api
       def_param_group :registry do
         param :registry, Hash, :required => true, :action_aware => true do
           param :name, String, :required => true
+          param_group :taxonomies, ::Api::V2::BaseController
           param :url, String, :required => true
           param :description, String
           param :username, String
@@ -34,7 +36,7 @@ module Api
       api :POST, '/registries/', N_('Create a docker registry')
       param_group :registry, :as => :create
       def create
-        @registry = DockerRegistry.new(params[:registry])
+        @registry = DockerRegistry.new(docker_registry_params)
         process_response @registry.save
       end
 
@@ -42,7 +44,7 @@ module Api
       param :id, :identifier, :required => true
       param_group :registry, :as => :update
       def update
-        process_response @registry.update_attributes(params[:registry])
+        process_response @registry.update_attributes(docker_registry_params)
       end
 
       api :DELETE, '/registries/:id/', N_('Delete a docker registry')

data/app/controllers/concerns/foreman/controller/parameters/docker_registry.rb

@@ -0,0 +1,19 @@
+module Foreman::Controller::Parameters::DockerRegistry
+  extend ActiveSupport::Concern
+
+  class_methods do
+    def docker_registry_params_filter
+      Foreman::ParameterFilter.new(::DockerRegistry).tap do |filter|
+        filter.permit :name, :url, :username, :password, :description,
+                      :location_ids => [], :organization_ids => []
+      end
+    end
+  end
+
+  def docker_registry_params
+    param_name = parameter_filter_context.api? ? 'registry' : 'docker_registry'
+    self.class.docker_registry_params_filter.filter_params(params, parameter_filter_context,
+                                                           param_name
+                                                          )
+  end
+end

data/app/controllers/containers/steps_controller.rb

@@ -35,10 +35,29 @@ module Containers
     end
 
     def build_state
-      s = @state.send(:"build_#{step}", params[:"docker_container_wizard_states_#{step}"])
+      s = @state.send(:"build_#{step}", state_params)
       instance_variable_set("@docker_container_wizard_states_#{step}", s)
     end
 
+    def state_params
+      attrs = case step
+              when :preliminary
+                [:wizard_state, :compute_resource_id]
+              when :image
+                [:repository_name, :tag, :wizard_state, :registry_id, :capsule_id, :katello]
+              when :configuration
+                [:name, :command, :entrypoint, :cpu_set, :cpu_shares, :memory, :wizard_state]
+              when :environment
+                [:tty, :docker_container_wizard_state_id,
+                 :attach_stdin, :attach_stdout, :attach_stderr,
+                 :exposed_ports_attributes => [], :environment_variables_attributes => [],
+                 :dns_attributes => []
+                ]
+              end
+
+      params.require("docker_container_wizard_states_#{step}").permit(*attrs)
+    end
+
     def set_form
       instance_variable_set(
         "@docker_container_wizard_states_#{step}",
@@ -46,7 +65,7 @@ module Containers
     end
 
     def create_container(start = true)
-      @state.send(:"create_#{step}", params[:"docker_container_wizard_states_#{step}"])
+      @state.send(:"create_#{step}", state_params)
       service = Service::Containers.new
       container = if start.is_a? TrueClass
                     service.start_container!(@state)

data/app/controllers/containers_controller.rb

@@ -102,6 +102,7 @@ class ContainersController < ::ApplicationController
     if params[:compute_resource_id].present?
       compute_resource_id = params[:compute_resource_id]
       container_uuid      = params[:id]
+      @container ||= Container.authorized("#{action_permission}_#{controller_name}".to_sym).find_by_uuid(container_uuid)
     else
       find_container
       compute_resource_id = @container.compute_resource_id

data/app/controllers/registries_controller.rb

@@ -1,5 +1,6 @@
 class RegistriesController < ::ApplicationController
   include Foreman::Controller::AutoCompleteSearch
+  include Foreman::Controller::Parameters::DockerRegistry
   before_filter :find_registry, :only => [:edit, :update, :destroy]
 
   def index
@@ -12,7 +13,7 @@ class RegistriesController < ::ApplicationController
   end
 
   def create
-    @registry = DockerRegistry.new(params[:docker_registry])
+    @registry = DockerRegistry.new(docker_registry_params)
     if @registry.save
       process_success
     else
@@ -24,7 +25,7 @@ class RegistriesController < ::ApplicationController
   end
 
   def update
-    if @registry.update_attributes(params[:docker_registry])
+    if @registry.update_attributes(docker_registry_params)
       process_success
     else
       process_error

data/app/models/container.rb

@@ -24,11 +24,6 @@ class Container < ActiveRecord::Base
   accepts_nested_attributes_for :exposed_ports, :allow_destroy => true
   scoped_search :on => :name
 
-  attr_accessible :command, :repository_name, :name, :compute_resource_id, :entrypoint,
-                  :cpu_set, :cpu_shares, :memory, :tty, :attach_stdin, :registry_id,
-                  :attach_stdout, :attach_stderr, :tag, :uuid, :environment_variables_attributes,
-                  :katello, :exposed_ports_attributes, :dns
-
   validates :name, :uniqueness => { :scope => :compute_resource_id }
 
   def repository_pull_url

data/app/models/docker_container_wizard_states/configuration.rb

@@ -3,9 +3,5 @@ module DockerContainerWizardStates
     self.table_name_prefix = 'docker_container_wizard_states_'
     belongs_to :wizard_state, :class_name => DockerContainerWizardState,
                               :foreign_key => :docker_container_wizard_state_id
-
-    validates :command, :presence => true
-
-    attr_accessible :name, :command, :entrypoint, :cpu_set, :cpu_shares, :memory, :wizard_state
   end
 end

data/app/models/docker_container_wizard_states/environment.rb

@@ -3,10 +3,6 @@ module DockerContainerWizardStates
     self.table_name_prefix = 'docker_container_wizard_states_'
     belongs_to :wizard_state, :class_name => DockerContainerWizardState
 
-    attr_accessible :tty, :docker_container_wizard_state_id,
-                    :attach_stdin, :attach_stdout, :attach_stderr,
-                    :exposed_ports_attributes, :environment_variables_attributes,
-                    :dns_attributes
     # Fix me:
     # Validations are off on this association as there's a bug in ::Parameter
     # that forces validation of reference_id. This will fail on new records as

data/app/models/docker_container_wizard_states/image.rb

@@ -7,7 +7,5 @@ module DockerContainerWizardStates
 
     validates :tag,             :presence => true
     validates :repository_name, :presence => true
-
-    attr_accessible :repository_name, :tag, :wizard_state, :registry_id, :capsule_id, :katello
   end
 end

data/app/models/docker_container_wizard_states/preliminary.rb

@@ -2,8 +2,6 @@ module DockerContainerWizardStates
   class Preliminary < ActiveRecord::Base
     include Taxonomix
 
-    attr_accessible :wizard_state, :compute_resource_id
-
     self.table_name_prefix = 'docker_container_wizard_states_'
     belongs_to :wizard_state, :class_name => DockerContainerWizardState,
                               :foreign_key => :docker_container_wizard_state_id

data/app/models/docker_registry.rb

@@ -3,12 +3,15 @@ class DockerRegistry < ActiveRecord::Base
   include Taxonomix
   include Encryptable
 
+  default_scope do
+    with_taxonomy_scope do
+      order('docker_registries.name')
+    end
+  end
+
   has_many :containers, :foreign_key => "registry_id", :dependent => :destroy
   encrypts :password
 
-  attr_accessible :name, :url, :username, :password, :locations, :organizations,
-    :description
-
   validates_lengths_from_database
   validates :name, :presence => true, :uniqueness => true
   validates :url,  :presence => true, :uniqueness => true,

data/app/models/environment_variable.rb

@@ -2,5 +2,4 @@ class EnvironmentVariable < Parameter
   belongs_to :container, :foreign_key => :reference_id, :inverse_of => :environment_variables
   audited :except => [:priority], :associated_with => :container, :allow_mass_assignment => true
   validates :name, :uniqueness => { :scope => :reference_id }
-  attr_accessible :priority
 end

data/app/models/exposed_port.rb

@@ -1,5 +1,4 @@
 class ExposedPort < Parameter
-  attr_accessible :priority
   # The Parameter class from which ExposedPort class inherits,validates for the
   # presence of an  associated domain, operating system, host or host group. We
   # will have to reset those validations for the  ExposedPort class as  they do

data/app/models/foreman_docker/dns.rb

@@ -2,8 +2,6 @@ require 'resolv'
 
 module ForemanDocker
   class Dns < Parameter
-    attr_accessible :priority
-
     # The Parameter class from which this Dns class inherits,validates for the
     # presence of an associated domain,  operating system, host or host group.
     # We will have to reset those validations for the Dns class as they do not

data/app/models/foreman_docker/docker.rb

@@ -2,8 +2,6 @@ require 'uri'
 
 module ForemanDocker
   class Docker < ::ComputeResource
-    attr_accessible :email
-
     validates :url, :format => { :with => URI.regexp }
     validates :email, :format => { :with => /.+@.+\..+/i }, :allow_blank => true
 
@@ -61,7 +59,7 @@ module ForemanDocker
 
     def tags(image_name)
       if exist?(image_name)
-        tags_for_local_image(local_images(image_name).first)
+        tags_for_local_image(image(image_name))
       else
         # If image is not found in the compute resource, get the tags from the Hub
         hub_api_url = "https://index.docker.io/v1/repositories/#{image_name}/tags"

data/app/models/service/containers.rb

@@ -24,7 +24,8 @@ module Service
     end
 
     def create_container_object(wizard_state)
-      container = Container.new(wizard_state.container_attributes) do |r|
+      container = Container.new do |r|
+        r.attributes = wizard_state.container_attributes
         # eagerly load environment variables and exposed ports configuration
         state = DockerContainerWizardState.includes(
           :environment => [:environment_variables, :exposed_ports]).find(wizard_state.id)
@@ -38,12 +39,11 @@ module Service
         container.send(:"#{taxonomy}=", wizard_state.preliminary.send(:"#{taxonomy}"))
       end
 
-      unless container.valid?
-        @errors = container.errors
-        fail ActiveRecord::Rollback
-      end
+      pull_image(container)
+      start_container(container)
+      errors << container.errors unless container.valid?
 
-      fail ActiveRecord::Rollback unless pull_image(container) && start_container(container)
+      fail ActiveRecord::Rollback if @errors.present?
 
       container.name = container.in_fog.name[1..-1] unless container.name.present?
 
@@ -51,7 +51,9 @@ module Service
     end
 
     def pull_image(container)
-      container.compute_resource.create_image(:fromImage => container.repository_pull_url)
+      success = container.compute_resource.
+        create_image(:fromImage => container.repository_pull_url)
+      errors << container.compute_resource.errors[:base] unless success
     end
 
     def start_container(container)
@@ -71,24 +73,27 @@ module Service
 
     def load_environment_variables(state, r)
       state.environment_variables.each do |environment_variable|
-        r.environment_variables.build :name     => environment_variable.name,
-                                      :value    => environment_variable.value,
-                                      :priority => environment_variable.priority
+        var = r.environment_variables.build
+        var.name = environment_variable.name
+        var.value = environment_variable.value
+        var.priority = environment_variable.priority
       end
     end
 
     def load_exposed_ports(state, r)
       state.exposed_ports.each do |e|
-        r.exposed_ports.build :name => e.name,
-                              :value => e.value,
-                              :priority => e.priority
+        port = r.exposed_ports.build
+        port.name = e.name
+        port.value = e.value
+        port.priority = e.priority
       end
     end
 
     def load_dns(state, r)
       state.dns.each do |e|
-        r.dns.build :name => e.name,
-                    :priority => e.priority
+        dns = r.dns.build
+        dns.name = e.name
+        dns.priority = e.priority
       end
     end
 

data/app/views/api/v2/registries/show.json.rabl

@@ -2,6 +2,6 @@ object @registry
 
 extends "api/v2/registries/main"
 
-node do |container|
-  partial("api/v2/taxonomies/children_nodes", :object => container)
+node do |registry|
+  partial("api/v2/taxonomies/children_nodes", :object => registry)
 end

data/app/views/compute_resources_vms/index/_docker.html.erb

@@ -1,29 +1,28 @@
-<table class="table table-bordered" data-table='inline'>
-  <thead>
-    <tr>
-      <th><%= _('Name')   %></th>
-      <th><%= _('Image')  %></th>
-      <th><%= _('CPUs')   %></th>
-      <th><%= _('Memory') %></th>
-      <th><%= _('Status') %></th>
-      <th><%= _('Power')  %></th>
-      <th></th>
-    </tr>
-  </thead>
-  <% @vms.each do |vm| %>
-    <tr>
-      <% name = vm.name || (!vm.attributes['names'].empty? && vm.attributes['names'].first) %>
-      <td><%= link_to_if_authorized name, hash_for_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => vm.identity) %></td>
-      <td><%= vm.image %></td>
-      <td><%= vm.cores %></td>
-      <td> <%= number_to_human_size vm.memory %> </td>
-      <td> <%= vm.attributes['status'] %> </td>
-      <td> <span <%= vm_power_class(vm.ready?) %>> <%= vm_state(vm) %></span> </td>
-      <td>
-        <%= action_buttons(container_power_action(vm),
-                           display_delete_if_authorized(hash_for_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => vm.id))) %>
-      </td>
-
-    </tr>
-  <% end %>
-</table>
+<thead>
+  <tr>
+    <th><%= _('Name')   %></th>
+    <th><%= _('Image')  %></th>
+    <th><%= _('CPUs')   %></th>
+    <th><%= _('Memory') %></th>
+    <th><%= _('Status') %></th>
+    <th><%= _('Power')  %></th>
+    <th><%= _('Action')  %></th>
+  </tr>
+</thead>
+<tbody>
+<% @vms.each do |vm| %>
+  <tr>
+    <% name = vm.name || (!vm.attributes['names'].empty? && vm.attributes['names'].first) %>
+    <td><%= link_to_if_authorized name, hash_for_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => vm.identity) %></td>
+    <td><%= vm.image %></td>
+    <td><%= vm.cores %></td>
+    <td> <%= number_to_human_size vm.memory %> </td>
+    <td> <%= vm.attributes['status'] %> </td>
+    <td> <span <%= vm_power_class(vm.ready?) %>> <%= vm_state(vm) %></span> </td>
+    <td>
+      <%= action_buttons(container_power_action(vm),
+                         display_delete_if_authorized(hash_for_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => vm.id))) %>
+    </td>
+  </tr>
+<% end %>
+</tbody>

data/app/views/containers/steps/preliminary.html.erb

@@ -21,8 +21,9 @@
         <hr>
         <%= select_f f, 'compute_resource_id', @container_resources, :id, :to_label, {}, { :label => _('Deploy on') } %>
       <% else %>
+
         <div class="alert alert-warning alert-dismissable">
-          <%= image_tag 'false.png' %> <%= (_("You need a Docker compute resource in order to create containers. Please %s and try again.") % link_to('add a new one', hash_for_new_compute_resource_path)).html_safe %>
+          <%= image_tag 'false.png' %> <%= (_("You need a Docker compute resource in order to create containers. Please %s and try again.") % link_to('add a new one', new_compute_resource_path)).html_safe %>
         </div>
       <% end %>
     </div>

data/db/migrate/20141209182008_remove_docker_tables.rb

@@ -28,8 +28,8 @@ class RemoveDockerTables < ActiveRecord::Migration
       remove_foreign_key :containers, :name => :containers_docker_tag_id_fk
     end
 
-    remove_column :containers, :docker_image_id
-    remove_column :containers, :docker_tag_id
+    remove_reference :containers, :docker_image, :foreign_key => true
+    remove_reference :containers, :docker_tag, :foreign_key => true
 
     # these tables might have foreign keys from plugins like katello so use cascade
     cascade_drop(:docker_images)

data/lib/foreman_docker/engine.rb

@@ -103,6 +103,8 @@ module ForemanDocker
                      :resource_type => 'Docker/ImageSearch'
         end
 
+        parameter_filter ComputeResource, :email
+
         # apipie API documentation
         # Only available in 1.8, otherwise it has to be in the initializer below
         if SETTINGS[:version].to_s.include?('develop') ||

data/lib/foreman_docker/tasks/test.rake

@@ -8,6 +8,7 @@ namespace :test do
         "#{ForemanDocker::Engine.root}/test/**/*_test.rb"
       ]
       t.verbose = true
+      t.warning = false
     end
 
     Rake::Task[test_task.name].invoke

data/lib/foreman_docker/version.rb

@@ -1,3 +1,3 @@
 module ForemanDocker
-  VERSION = '2.1.1'
+  VERSION = '3.0.0'
 end

data/test/factories/compute_resources.rb

@@ -7,7 +7,7 @@ FactoryGirl.define do
       user 'dockeruser'
       password 'dockerpassword'
       email 'container@containerization.com'
-      url 'unix:///var/run/docker.sock'
+      url 'unix:///var/run/docker.falsesock'
     end
 
     factory :docker_cr, :class => ForemanDocker::Docker, :traits => [:docker]

data/test/functionals/api/v2/containers_controller_test.rb

@@ -46,7 +46,9 @@ module Api
           end
 
           test 'delete removes a container in foreman and in Docker host' do
+            Fog.mock!
             delete :destroy, :id => @container.id
+            Fog.unmock!
             assert_response :success
             assert_equal ActiveSupport::JSON.decode(response.body)['name'], 'foo'
           end
@@ -60,51 +62,53 @@ module Api
           end
         end
 
-        test 'power call turns on/off container in Docker host' do
-          Fog.mock!
-          Fog::Compute::Fogdocker::Server.any_instance.expects(:start)
-          put :power, :id => @container.id, :power_action => 'start'
-          assert_response :success
-        end
+        context 'power calls' do
+          setup { Fog.mock! }
+          teardown { Fog.unmock! }
 
-        test 'power call checks status of container in Docker host' do
-          Fog.mock!
-          Fog::Compute::Fogdocker::Server.any_instance.expects(:ready?).returns(false)
-          put :power, :id => @container.id, :power_action => 'status'
-          assert_response :success
-          assert_equal ActiveSupport::JSON.decode(response.body)['running'], false
-        end
+          test 'power call turns on/off container in Docker host' do
+            Fog::Compute::Fogdocker::Server.any_instance.expects(:start)
+            put :power, :id => @container.id, :power_action => 'start'
+            assert_response :success
+          end
 
-        test 'power call host' do
-          Fog.mock!
-          Fog::Compute::Fogdocker::Server.any_instance.expects(:ready?).returns(false)
-          put :power, :id => @container.id, :power_action => 'status'
-          assert_response :success
-          assert_equal ActiveSupport::JSON.decode(response.body)['running'], false
-        end
+          test 'power call checks status of container in Docker host' do
+            Fog::Compute::Fogdocker::Server.any_instance.expects(:ready?).returns(false)
+            put :power, :id => @container.id, :power_action => 'status'
+            assert_response :success
+            assert_equal ActiveSupport::JSON.decode(response.body)['running'], false
+          end
 
-        test 'creates a container with correct params' do
-          repository_name = "centos"
-          tag = "7"
-          name = "foo"
-          registry_uri = URI.parse(@registry.url)
-          Service::Containers.any_instance.expects(:pull_image).returns(true)
-          Service::Containers.any_instance
-            .expects(:start_container).returns(true).with do |container|
-            container.must_be_kind_of(Container)
-            container.repository_name.must_equal(repository_name)
-            container.tag.must_equal(tag)
-            container.compute_resource_id.must_equal(@compute_resource.id)
-            container.name.must_equal(name)
-            container.repository_pull_url.must_include(registry_uri.host)
-            container.repository_pull_url.must_include("#{repository_name}:#{tag}")
+          test 'power call host' do
+            Fog::Compute::Fogdocker::Server.any_instance.expects(:ready?).returns(false)
+            put :power, :id => @container.id, :power_action => 'status'
+            assert_response :success
+            assert_equal ActiveSupport::JSON.decode(response.body)['running'], false
+          end
+
+          test 'creates a container with correct params' do
+            repository_name = "centos"
+            tag = "7"
+            name = "foo"
+            registry_uri = URI.parse(@registry.url)
+            Service::Containers.any_instance.expects(:pull_image).returns(true)
+            Service::Containers.any_instance
+              .expects(:start_container).returns(true).with do |container|
+              container.must_be_kind_of(Container)
+              container.repository_name.must_equal(repository_name)
+              container.tag.must_equal(tag)
+              container.compute_resource_id.must_equal(@compute_resource.id)
+              container.name.must_equal(name)
+              container.repository_pull_url.must_include(registry_uri.host)
+              container.repository_pull_url.must_include("#{repository_name}:#{tag}")
+            end
+            post :create, :container => { :compute_resource_id => @compute_resource.id,
+                                          :name => name,
+                                          :registry_id => @registry.id,
+                                          :repository_name => repository_name,
+                                          :tag => tag }
+            assert_response :created
           end
-          post :create, :container => { :compute_resource_id => @compute_resource.id,
-                                        :name => name,
-                                        :registry_id => @registry.id,
-                                        :repository_name => repository_name,
-                                        :tag => tag }
-          assert_response :created
         end
 
         test 'creates a katello container with correct params' do

data/test/functionals/containers_controller_test.rb

@@ -59,6 +59,21 @@ class ContainersControllerTest < ActionController::TestCase
         flash[:notice]
     end
 
+    test 'deleting with container params deletes container object' do
+      managed_container = FactoryGirl.create(
+        :container,
+        :compute_resource => @container_resource)
+      managed_container.update(:uuid => @container.id)
+      ComputeResource.any_instance.expects(:destroy_vm).
+        with(@container.id).returns(true)
+      Container.any_instance.expects(:destroy)
+      delete :destroy, { :compute_resource_id => @container_resource.id,
+                         :id                  => @container.id }, set_session_user
+      assert_redirected_to containers_path
+      assert_equal "Container #{managed_container.uuid} is being deleted.",
+        flash[:notice]
+    end
+
     test 'failed deletion of managed container keeps container in Foreman' do
       ComputeResource.any_instance.stubs(:destroy_vm).
         raises(::Foreman::Exception.new('Could not destroy Docker container'))

data/test/units/containers_service_test.rb

@@ -24,4 +24,15 @@ class ContainersServiceTest < ActiveSupport::TestCase
     Fog.unmock!
     assert_equal DockerContainerWizardState.where(:id => @state.id).count, 0
   end
+
+  test 'passes errors from compute resource' do
+    # Since the compute resource will be unreachable, this test will always
+    # fail at the 'pull_image' step
+    containers_service = Service::Containers.new
+    assert_raises(ActiveRecord::Rollback) do
+      containers_service.create_container_object(@state)
+    end
+    assert containers_service.errors.present?
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_docker
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Daniel Lobato, Amos Benari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-15 00:00:00.000000000 Z
+date: 2016-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -68,6 +68,7 @@ files:
 - app/assets/stylesheets/foreman_docker/terminal.css.scss
 - app/controllers/api/v2/containers_controller.rb
 - app/controllers/api/v2/registries_controller.rb
+- app/controllers/concerns/foreman/controller/parameters/docker_registry.rb
 - app/controllers/concerns/foreman_docker/find_container.rb
 - app/controllers/containers/steps_controller.rb
 - app/controllers/containers_controller.rb