foreman_docker 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4e681e8c0ceee246d607633e6b910b9dc6ba280
-  data.tar.gz: 8e56c72c227e1a14cb14a22f44b854fab6f2bc6c
+  metadata.gz: 86749f058604f314afa36079efedb8335d2ef47e
+  data.tar.gz: b8ef0a060b0475b26e09b4a6cf2696d544005d80
 SHA512:
-  metadata.gz: ee41e12ec2a7dca60bb0d2bed285e1cbdada0ec0b28e853e33d6bc3d998b0436d37c2dec7c01313b367f184b5ad44d3d7df32c72d2c9886c8a4f4adddc86a89e
-  data.tar.gz: 8cd2fb046a8e8521954cafa9f6e6183b1b6fb6a45a06ec228a7d3800d8ec5e12342b6e36bf5259078c9165b4764e3cf41b37c168b9565050d25ac1c8ddfd1077
+  metadata.gz: 448a15eb9db1bfa4ed7f18037ab4cb9ff094ba7887663016b9a960bca4403ce24e419f02440c60c8baea03a961d31b66d7c003868e0ef72dd397a5fe19628708
+  data.tar.gz: 2ca249ac65d7589834c7f583312b180d6689ad8b20f85811a2aecd2c99704d20f34377b29e0a97ee47988a089c2ddd414bba0378afd191e6e9797d5ce52f9460

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

@@ -0,0 +1,170 @@
+# module ForemanDocker
+module Api
+  module V2
+    class ContainersController < ::Api::V2::BaseController
+      before_filter :find_resource, :except => %w(index create)
+
+      resource_description do
+        resource_id 'containers'
+        api_version 'v2'
+        api_base_url '/api/v2'
+      end
+
+      api :GET, '/containers/', N_('List all containers')
+      api :GET, '/compute_resources/:compute_resource_id/containers/',
+          N_('List all containers in a compute resource')
+      param :compute_resource_id, :identifier
+      param_group :pagination, ::Api::V2::BaseController
+
+      def index
+        if params[:compute_resource_id].present?
+          @containers = Container.where(:compute_resource_id => params[:compute_resource_id])
+        else
+          @containers = Container.all
+        end
+      end
+
+      api :GET, '/containers/:id/', N_('Show a container')
+      api :GET, '/compute_resources/:compute_resource_id/containers/:id',
+          N_('Show container in a compute resource')
+      param :id, :identifier, :required => true
+      param :compute_resource_id, :identifier
+
+      def show
+      end
+
+      def_param_group :container do
+        param :container, Hash, :required => true, :action_aware => true do
+          param :name, String, :required => true
+          param_group :taxonomies, ::Api::V2::BaseController
+          param :compute_resource_id, :identifier, :required => true
+          param :registry_id, :identifier, :desc => N_('Registry this container will have to use
+                                                        to get the image')
+          param :image, String, :desc => N_('Image to use to create the container.
+                                            Format should be repository:tag, e.g: centos:7')
+          param :tty, :bool
+          param :entrypoint, String
+          param :cmd, String
+          param :memory, String
+          param :cpu_shares, :number
+          param :cpu_sets, String
+          param :environment_variables, Hash
+          param :attach_stdout, :bool
+          param :attach_stdin, :bool
+          param :attach_stderr, :bool
+          param :katello, :bool
+        end
+      end
+
+      api :POST, '/containers/', N_('Create a container')
+      api :POST, '/compute_resources/:compute_resource_id/containers/',
+          N_('Create container in a compute resource')
+      param_group :container, :as => :create
+
+      def create
+        @container = Service::Containers.new.start_container!(set_wizard_state)
+        set_container_taxonomies
+        process_response @container.save
+      rescue ActiveModel::MassAssignmentSecurity::Error => e
+        render :json => { :error  => _("Wrong attributes: %s") % e.message },
+               :status => :unprocessable_entity
+      end
+
+      api :DELETE, '/containers/:id/', N_('Delete a container')
+      api :DELETE, '/compute_resources/:compute_resource_id/containers/:id',
+          N_('Delete container in a compute resource')
+      param :id, :identifier, :required => true
+      param :compute_resource_id, :identifier
+
+      def destroy
+        process_response @container.destroy
+      end
+
+      api :GET, '/containers/:id/logs', N_('Show container logs')
+      api :GET, '/compute_resources/:compute_resource_id/containers/:id/logs',
+          N_('Show logs from a container in a compute resource')
+      param :id, :identifier, :required => true
+      param :compute_resource_id, :identifier
+      param :stdout, :bool
+      param :stderr, :bool
+      param :tail,   Fixnum, N_('Number of lines to tail. Default: 100')
+
+      def logs
+        render :json => { :logs => Docker::Container.get(@container.uuid)
+          .logs(:stdout => (params[:stdout] || true),
+                :stderr => (params[:stderr] || false),
+                :tail   => (params[:tail]   || 100)) }
+      end
+
+      api :PUT, '/containers/:id/power', N_('Run power operation on a container')
+      api :PUT, '/compute_resources/:compute_resource_id/containers/:id/power',
+          N_('Run power operation on a container in a compute resource')
+      param :id, :identifier, :required => true
+      param :compute_resource_id, :identifier
+      param :power_action, String,
+            :required => true,
+            :desc     => N_('power action, valid actions are (start), (stop), (status)')
+
+      def power
+        power_actions = %(start stop status)
+        if power_actions.include? params[:power_action]
+          response = if params[:power_action] == 'status'
+                       { :running => @container.in_fog.ready? }
+                     else
+                       { :running => @container.in_fog.send(params[:power_action]) }
+                     end
+          render :json => response
+        else
+          render :json =>
+            { :error => _("Unknown method: available power operations are %s") %
+              power_actions.join(', ') }, :status => :unprocessable_entity
+        end
+      end
+
+      private
+
+      def set_wizard_state
+        wizard_properties = { :preliminary   => [:compute_resource_id],
+                              :image         => [:registry_id, :repository_name, :tag, :katello],
+                              :configuration => [:name, :command, :entrypoint, :cpu_set,
+                                                 :cpu_shares, :memory],
+                              :environment   => [:tty, :attach_stdin, :attach_stdout,
+                                                 :attach_stderr] }
+
+        wizard_state = DockerContainerWizardState.create
+        wizard_properties.each do |step, properties|
+          property_values = properties.each_with_object({}) do |property, values|
+            values[:"#{property}"] = params[:container][:"#{property}"]
+          end
+          wizard_state.send(:"create_#{step}", property_values)
+        end
+
+        if params[:container][:environment_variables].present?
+          wizard_state.environment.environment_variables =
+            params[:container][:environment_variables]
+        end
+        wizard_state.tap(&:save)
+      end
+
+      def set_container_taxonomies
+        Taxonomy.enabled_taxonomies.each do |taxonomy|
+          if params[:container][:"#{taxonomy}"].present?
+            @container.send(:"#{taxonomy}=", params[:container][:"#{taxonomy}"])
+          end
+        end
+      end
+
+      def action_permission
+        case params[:action]
+        when 'logs'
+          :view
+        when 'power'
+          :edit
+        else
+          super
+        end
+      end
+    end
+  end
+end
+# end

data/app/controllers/containers_controller.rb

@@ -1,7 +1,7 @@
 class ContainersController < ::ApplicationController
   include ForemanDocker::FindContainer
 
-  before_filter :find_container, :only => [:show, :commit]
+  before_filter :find_container, :only => [:show, :commit, :power]
 
   def index
     @container_resources = allowed_resources
@@ -48,6 +48,28 @@ class ContainersController < ::ApplicationController
       { :container => @container, :e => e }
   end
 
+  def power
+    compute_resource = @container.compute_resource
+    @docker_container = compute_resource.find_vm_by_uuid(@container.uuid)
+    run_container_action(@docker_container.ready? ? :stop : :start)
+  end
+
+  def run_container_action(action)
+    if @docker_container.send(action)
+      @docker_container.reload
+      notice _("%{vm} is now %{vm_state}") %
+        { :vm => @docker_container, :vm_state => @docker_container.state.capitalize }
+      redirect_to containers_path(:id => @container.id)
+    else
+      error _("failed to %{action} %{vm}") % { :action => _(action), :vm => @docker_container }
+      redirect_to :back
+    end
+    # This should only rescue Fog::Errors, but Fog returns all kinds of errors...
+  rescue => e
+    error _("Error - %{message}") % { :message => _(e.message) }
+    redirect_to :back
+  end
+
   private
 
   def action_permission
@@ -56,6 +78,16 @@ class ContainersController < ::ApplicationController
       :view
     when 'commit'
       :commit
+    when 'power'
+      :power_compute_resources_vms
+    else
+      super
+    end
+  end
+
+  def current_permission
+    if params[:action] == 'power'
+      :power_compute_resources_vms
     else
       super
     end

data/app/helpers/containers_helper.rb

@@ -1,8 +1,4 @@
 module ContainersHelper
-  def managed_icon(container, resource)
-    icon_text(managed?(container, resource) ? 'check' : 'unchecked')
-  end
-
   def managed?(container, resource)
     uuids_in_resource(resource).include? container.identity
   end
@@ -39,7 +35,7 @@ module ContainersHelper
         button_group(
           link_to(_('Commit'), '#commit-modal', :'data-toggle' => 'modal')
         ),
-        button_group(vm_power_action(container.in_fog)),
+        button_group(container_power_action(container.in_fog)),
         button_group(
           display_delete_if_authorized(
             hash_for_container_path(:id => container.id)
@@ -51,6 +47,33 @@ module ContainersHelper
     )
   end
 
+  def container_power_action(vm, authorizer = nil)
+    if managed?(vm, @compute_resource)
+      id = Container.find_by_uuid(vm.identity).id
+      opts = hash_for_power_container_path(:id => id)
+             .merge(:auth_object => @compute_resource,
+                    :permission => 'power_compute_resources_vms',
+                    :authorizer => authorizer)
+    else
+      opts = hash_for_power_compute_resource_vm_path(:compute_resource_id => @compute_resource,
+                                                     :id => vm.identity)
+             .merge(:auth_object => @compute_resource, :permission => 'power_compute_resources_vms',
+                    :authorizer => authorizer)
+    end
+    html = if vm.ready?
+             { :confirm => power_on_off_message(vm), :class => "btn btn-danger" }
+           else
+             { :class => "btn btn-info" }
+           end
+
+    display_link_if_authorized "Power #{action_string(vm)}", opts, html.merge(:method => :put)
+  end
+
+  def power_on_off_message(vm)
+    _("Are you sure you want to power %{act} %{vm}?") % { :act => action_string(vm).downcase.strip,
+                                                          :vm => vm  }
+  end
+
   def auto_complete_docker_search(name, val, options = {})
     addClass options, 'form-control'
     text_field_tag(name, val, options)

data/app/models/concerns/fog_extensions/fogdocker/images.rb

@@ -0,0 +1,14 @@
+# Compatibility fixes - to be removed once 1.7 compatibility is no longer required
+module FogExtensions
+  module Fogdocker
+    module Images
+      extend ActiveSupport::Concern
+
+      def image_search(query = {})
+        Docker::Util.parse_json(Docker.connection.get('/images/search', query)).map do |image|
+          downcase_hash_keys(image)
+        end
+      end
+    end
+  end
+end

data/app/models/docker_registry.rb

@@ -8,6 +8,7 @@ class DockerRegistry < ActiveRecord::Base
 
   validates_lengths_from_database
   validates :name, :presence => true, :uniqueness => true
+  validates :url,  :presence => true, :uniqueness => true
 
   scoped_search :on => :name, :complete_value => true
   scoped_search :on => :url

data/app/views/api/v2/containers/base.json.rabl

@@ -0,0 +1,3 @@
+object @container
+
+attributes :id, :name, :uuid

data/app/views/api/v2/containers/index.json.rabl

@@ -0,0 +1,3 @@
+collection @containers
+
+extends 'api/v2/containers/main'

data/app/views/api/v2/containers/main.json.rabl

@@ -0,0 +1,9 @@
+object @container
+
+extends 'api/v2/containers/base'
+
+attributes :command, :compute_resource_id, :compute_resource_name, :entrypoint,
+           :cpu_set, :cpu_shares, :memory, :tty,
+           :attach_stdin, :attach_stdout, :attach_stderr,
+           :repository_name, :tag, :registry_id, :registry_name,
+           :created_at, :updated_at

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

@@ -0,0 +1,7 @@
+object @container
+
+extends "api/v2/containers/main"
+
+node do |container|
+  partial("api/v2/taxonomies/children_nodes", :object => container)
+end

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

@@ -20,7 +20,7 @@
       <td> <%= vm.attributes['status'] %> </td>
       <td> <span <%= vm_power_class(vm.ready?) %>> <%= vm_state(vm) %></span> </td>
       <td>
-        <%= action_buttons(vm_power_action(vm),
+        <%= 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>
 

data/app/views/containers/_list.html.erb

@@ -24,9 +24,9 @@
         <span class="glyphicon glyphicon-time"></span> <%= container.ready? ? time_ago_in_words(container.started_at) : "N/A" %>
       </td>
       <td class="hidden-tablet hidden-xs text-center"><%= link_to resource, compute_resource_path(resource) %> </td>
-      <td class="hidden-tablet hidden-xs text-center"><%= managed_icon(container, resource) %></td>
+      <td class="hidden-tablet hidden-xs text-center"><%= managed?(container, resource) ? _('Yes') : _('No') %></td>
       <% @compute_resource = resource %>
-      <td><%= action_buttons(vm_power_action(container),
+      <td><%= action_buttons(container_power_action(container),
                              display_delete_if_authorized(hash_for_container_path(:compute_resource_id => resource,
                                                           :id => container.id).
                                                           merge(:auth_object => resource, :auth_action => 'destroy',

data/app/views/containers/show.html.erb

@@ -47,7 +47,7 @@
               <td><%= _('Environment Variables') %></td>
               <td>
                 <table id="environment_variables" class="table table-bordered" style="table-layout:fixed; word-wrap: break-word">
-                  <% @container.in_fog.attributes['config_env'].each do |environment_variable| %>
+                  <% (@container.in_fog.attributes['config_env'] || []).each do |environment_variable| %>
                   <% pair = environment_variable.split("=") %>
                     <tr>
                       <td><b><%= pair.first %></b></td>

data/config/routes.rb

@@ -2,6 +2,7 @@ Rails.application.routes.draw do
   resources :containers, :only => [:index, :new, :show, :destroy] do
     member do
       post :commit
+      put :power
     end
   end
 
@@ -10,10 +11,34 @@ Rails.application.routes.draw do
   end
 
   resources :image_search, :only => [] do
-    get :auto_complete_repository_name, :on => :member
-    get :auto_complete_image_tag, :on => :member
-    get :search_repository, :on => :member
+    member do
+      get :auto_complete_repository_name
+      get :auto_complete_image_tag
+      get :search_repository
+    end
   end
 
-  resources :registries, :only => [:index, :new, :create, :update, :destroy, :edit]
+  resources :registries, :except => [:show]
+
+  scope :foreman_docker, :path => '/docker' do
+    namespace :api, :defaults => { :format => 'json' } do
+      scope "(:apiv)", :module => :v2, :defaults => { :apiv => 'v2' }, :apiv => /v2/,
+                       :constraints => ApiConstraints.new(:version => 2) do
+        resources :containers, :only => [:index, :create, :show, :destroy] do
+          member do
+            get :logs
+            put :power
+          end
+        end
+        resources :compute_resources, :only => [] do
+          resources :containers, :only => [:index, :create, :show, :destroy] do
+            member do
+              get :logs
+              put :power
+            end
+          end
+        end
+      end
+    end
+  end
 end

data/lib/foreman_docker/engine.rb

@@ -57,11 +57,20 @@ module ForemanDocker
         end
 
         security_block :containers do
-          permission :view_containers,    :containers         => [:index, :show]
-          permission :commit_containers,  :containers         => [:commit]
-          permission :create_containers,  :'containers/steps' => [:show, :update],
-                                          :containers         => [:new]
-          permission :destroy_containers, :containers         => [:destroy]
+          permission :view_containers,
+                     :containers          => [:index, :show],
+                     :'api/v2/containers' => [:index, :show, :logs]
+          permission :commit_containers, :containers => [:commit]
+          permission :create_containers,
+                     :'containers/steps'  => [:show, :update],
+                     :containers          => [:new],
+                     :'api/v2/containers' => [:create, :power]
+          permission :destroy_containers,
+                     :containers          => [:destroy],
+                     :'api/v2/containers' => [:destroy]
+          permission :power_compute_resources_vms,
+                     :containers          => [:power],
+                     :'api/v2/containers' => [:create, :power]
         end
 
         security_block :registries do
@@ -76,6 +85,26 @@ module ForemanDocker
                                        :auto_complete_image_tag,
                                        :search_repository]
         end
+
+        # apipie API documentation
+        # Only available in 1.8, otherwise it has to be in the initializer below
+        if SETTINGS[:version].to_s.include?('develop') ||
+           Gem::Version.new(SETTINGS[:version]) >= Gem::Version.new('1.8')
+          apipie_documented_controllers [
+            "#{ForemanDocker::Engine.root}/app/controllers/api/v2/*.rb"]
+        end
+      end
+    end
+
+    initializer "foreman_docker.apipie" do
+      # this condition is here for compatibility reason to work with Foreman 1.4.x
+      # Also need to handle the reverse of the 1.8 method above
+      unless SETTINGS[:version].to_s.include?('develop') ||
+             Gem::Version.new(SETTINGS[:version]) >= Gem::Version.new('1.8')
+        if Apipie.configuration.api_controllers_matcher.is_a?(Array)
+          Apipie.configuration.api_controllers_matcher <<
+            "#{ForemanDocker::Engine.root}/app/controllers/api/v2/*.rb"
+        end
       end
     end
 
@@ -85,13 +114,18 @@ module ForemanDocker
 
     require 'fog/fogdocker/models/compute/server'
     require 'fog/fogdocker/models/compute/image'
+    require 'fog/fogdocker/models/compute/images'
     require File.expand_path('../../../app/models/concerns/fog_extensions/fogdocker/server',
                              __FILE__)
     require File.expand_path('../../../app/models/concerns/fog_extensions/fogdocker/image',
                              __FILE__)
+    require File.expand_path('../../../app/models/concerns/fog_extensions/fogdocker/images',
+                             __FILE__)
     config.to_prepare do
       Fog::Compute::Fogdocker::Server.send(:include, ::FogExtensions::Fogdocker::Server)
       Fog::Compute::Fogdocker::Image.send(:include, ::FogExtensions::Fogdocker::Image)
+      # Compatibility fixes - to be removed once 1.7 compatibility is no longer required
+      Fog::Compute::Fogdocker::Images.send(:include, ::FogExtensions::Fogdocker::Images)
       ::Taxonomy.send(:include, ForemanDocker::TaxonomyExtensions)
     end
   end

data/lib/foreman_docker/version.rb

@@ -1,3 +1,3 @@
 module ForemanDocker
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

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

@@ -0,0 +1,70 @@
+require 'test_plugin_helper'
+
+module Api
+  module V2
+    class ContainersControllerTest < ActionController::TestCase
+      test 'index returns a list of all containers' do
+        get :index, {}, set_session_user
+        assert_response :success
+        assert_template 'index'
+      end
+
+      context 'container operations' do
+        setup do
+          @container = FactoryGirl.create(:container, :name => 'foo')
+        end
+
+        test 'logs returns latest lines of container log' do
+          fake_container = Struct.new(:logs)
+          fake_container.expects(:logs).returns('I am a log').twice
+          Docker::Container.expects(:get).with(@container.uuid).returns(fake_container)
+          get :logs, :id => @container.id
+          assert_response :success
+          assert_equal ActiveSupport::JSON.decode(response.body)['logs'], fake_container.logs
+        end
+
+        test 'show returns information about container'  do
+          get :show, :id => @container.id
+          assert_response :success
+          assert_equal ActiveSupport::JSON.decode(response.body)['name'], 'foo'
+        end
+
+        test 'delete removes a container in foreman and in Docker host' do
+          delete :destroy, :id => @container.id
+          assert_response :success
+          assert_equal ActiveSupport::JSON.decode(response.body)['name'], 'foo'
+        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
+
+        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 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 'creates a container with correct params' do
+          Service::Containers.any_instance.expects(:pull_image).returns(true)
+          Service::Containers.any_instance.expects(:start_container).returns(true)
+          post :create, :container => { :name => 'foo', :registry_id => 3, :image => 'centos:7' }
+          assert_response :created
+        end
+      end
+    end
+  end
+end

data/test/integration/container_test.rb

@@ -8,6 +8,7 @@ class ContainerIntegrationTest < ActionDispatch::IntegrationTest
 
   context 'available compute resource' do
     test 'shows containers list if compute resource is available' do
+      Fog.mock!
       ComputeResource.any_instance.stubs(:vms).returns([])
       FactoryGirl.create(:docker_cr)
       visit containers_path

data/test/units/docker_registry_test.rb

@@ -22,8 +22,9 @@ class DockerRegistryTest < ActiveSupport::TestCase
     assert registry.is_decryptable?(registry.password_in_db)
   end
 
-  test 'registries need a name' do
-    registry = FactoryGirl.build(:docker_registry, :name => '')
-    refute registry.valid?
+  %w(name url).each do |property|
+    test "registries need a #{property}" do
+      refute FactoryGirl.build(:docker_registry, property.to_sym => '').valid?
+    end
   end
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: foreman_docker
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Daniel Lobato, Amos Benari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: wicked
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 description: Provision and manage Docker containers and images from Foreman.
@@ -45,92 +45,99 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
-- README.md
-- Rakefile
-- app/assets/javascripts/foreman_docker/image_step.js
-- app/assets/stylesheets/foreman_docker/autocomplete.css.scss
-- app/assets/stylesheets/foreman_docker/terminal.css.scss
-- app/controllers/concerns/foreman_docker/find_container.rb
-- app/controllers/containers/steps_controller.rb
-- app/controllers/containers_controller.rb
-- app/controllers/image_search_controller.rb
-- app/controllers/registries_controller.rb
-- app/helpers/container_steps_helper.rb
-- app/helpers/containers_helper.rb
-- app/models/concerns/fog_extensions/fogdocker/image.rb
-- app/models/concerns/fog_extensions/fogdocker/server.rb
-- app/models/concerns/foreman_docker/parameter_validators.rb
-- app/models/container.rb
-- app/models/docker_container_wizard_state.rb
-- app/models/docker_container_wizard_states/configuration.rb
-- app/models/docker_container_wizard_states/environment.rb
-- app/models/docker_container_wizard_states/environment_variable.rb
-- app/models/docker_container_wizard_states/image.rb
-- app/models/docker_container_wizard_states/preliminary.rb
-- app/models/docker_registry.rb
-- app/models/environment_variable.rb
-- app/models/foreman_docker/docker.rb
-- app/models/foreman_docker/taxonomy_extensions.rb
-- app/models/service/containers.rb
-- app/models/service/registry_api.rb
-- app/views/api/v1/compute_resources/docker.json
-- app/views/api/v2/compute_resources/docker.json
 - app/views/compute_resources/form/_docker.html.erb
 - app/views/compute_resources/show/_docker.html.erb
-- app/views/compute_resources_vms/form/_docker.html.erb
-- app/views/compute_resources_vms/index/_docker.html.erb
-- app/views/compute_resources_vms/show/_docker.html.erb
-- app/views/containers/_list.html.erb
-- app/views/containers/index.html.erb
-- app/views/containers/show.html.erb
-- app/views/containers/steps/_form_buttons.html.erb
-- app/views/containers/steps/_image_hub_tab.html.erb
-- app/views/containers/steps/_title.html.erb
-- app/views/containers/steps/configuration.html.erb
+- app/views/image_search/_repository_search_results.html.erb
+- app/views/api/v2/compute_resources/docker.json
+- app/views/api/v2/containers/main.json.rabl
+- app/views/api/v2/containers/base.json.rabl
+- app/views/api/v2/containers/index.json.rabl
+- app/views/api/v2/containers/show.json.rabl
+- app/views/api/v1/compute_resources/docker.json
 - app/views/containers/steps/environment.html.erb
+- app/views/containers/steps/_title.html.erb
+- app/views/containers/steps/_form_buttons.html.erb
 - app/views/containers/steps/image.html.erb
 - app/views/containers/steps/preliminary.html.erb
-- app/views/foreman_docker/common_parameters/_environment_variable.html.erb
-- app/views/image_search/_repository_search_results.html.erb
-- app/views/images/form/_docker.html.erb
-- app/views/registries/_form.html.erb
+- app/views/containers/steps/_image_hub_tab.html.erb
+- app/views/containers/steps/configuration.html.erb
+- app/views/containers/_list.html.erb
+- app/views/containers/show.html.erb
+- app/views/containers/index.html.erb
 - app/views/registries/edit.html.erb
-- app/views/registries/index.html.erb
 - app/views/registries/new.html.erb
+- app/views/registries/_form.html.erb
+- app/views/registries/index.html.erb
+- app/views/foreman_docker/common_parameters/_environment_variable.html.erb
+- app/views/images/form/_docker.html.erb
+- app/views/compute_resources_vms/form/_docker.html.erb
+- app/views/compute_resources_vms/index/_docker.html.erb
+- app/views/compute_resources_vms/show/_docker.html.erb
+- app/models/docker_registry.rb
+- app/models/service/registry_api.rb
+- app/models/service/containers.rb
+- app/models/concerns/fog_extensions/fogdocker/image.rb
+- app/models/concerns/fog_extensions/fogdocker/images.rb
+- app/models/concerns/fog_extensions/fogdocker/server.rb
+- app/models/concerns/foreman_docker/parameter_validators.rb
+- app/models/docker_container_wizard_state.rb
+- app/models/container.rb
+- app/models/environment_variable.rb
+- app/models/foreman_docker/taxonomy_extensions.rb
+- app/models/foreman_docker/docker.rb
+- app/models/docker_container_wizard_states/environment.rb
+- app/models/docker_container_wizard_states/image.rb
+- app/models/docker_container_wizard_states/configuration.rb
+- app/models/docker_container_wizard_states/environment_variable.rb
+- app/models/docker_container_wizard_states/preliminary.rb
+- app/controllers/api/v2/containers_controller.rb
+- app/controllers/containers/steps_controller.rb
+- app/controllers/concerns/foreman_docker/find_container.rb
+- app/controllers/registries_controller.rb
+- app/controllers/image_search_controller.rb
+- app/controllers/containers_controller.rb
+- app/helpers/containers_helper.rb
+- app/helpers/container_steps_helper.rb
+- app/assets/javascripts/foreman_docker/image_step.js
+- app/assets/stylesheets/foreman_docker/terminal.css.scss
+- app/assets/stylesheets/foreman_docker/autocomplete.css.scss
 - config/routes.rb
-- db/migrate/20140930175337_add_email_to_compute_resource.rb
+- db/migrate/20141018110810_add_uuid_to_containers.rb
+- db/migrate/20141028164206_change_memory_in_container.rb
 - db/migrate/20141005233312_create_containers.rb
+- db/migrate/20141028164633_change_cpuset_in_container.rb
+- db/migrate/20141009011026_add_attributes_to_container.rb
+- db/migrate/20141222113313_create_wizard_states.rb
+- db/migrate/20150129054944_add_katello_flag_to_containers.rb
 - db/migrate/20141007225130_add_compute_resource_id_to_container.rb
 - db/migrate/20141009001613_add_tag_to_container.rb
-- db/migrate/20141009011026_add_attributes_to_container.rb
+- db/migrate/20141120123003_add_user_credentials_to_docker_registries.rb
+- db/migrate/20140930175337_add_email_to_compute_resource.rb
 - db/migrate/20141010173220_create_docker_images.rb
-- db/migrate/20141018110810_add_uuid_to_containers.rb
+- db/migrate/20150122011747_add_katello_flag_to_docker_wizard_image.rb
 - db/migrate/20141024163003_create_docker_registries.rb
-- db/migrate/20141028164206_change_memory_in_container.rb
-- db/migrate/20141028164633_change_cpuset_in_container.rb
-- db/migrate/20141120123003_add_user_credentials_to_docker_registries.rb
 - db/migrate/20141209182008_remove_docker_tables.rb
-- db/migrate/20141222113313_create_wizard_states.rb
-- db/migrate/20150122011747_add_katello_flag_to_docker_wizard_image.rb
-- db/migrate/20150129054944_add_katello_flag_to_containers.rb
-- lib/foreman_docker.rb
-- lib/foreman_docker/engine.rb
 - lib/foreman_docker/tasks/test.rake
 - lib/foreman_docker/version.rb
+- lib/foreman_docker/engine.rb
+- lib/foreman_docker.rb
 - locale/Makefile
+- LICENSE
+- Rakefile
+- README.md
+- test/functionals/api/v2/containers_controller_test.rb
+- test/functionals/containers_steps_controller_test.rb
+- test/functionals/container_controller_test.rb
+- test/factories/docker_registry.rb
 - test/factories/compute_resources.rb
 - test/factories/containers.rb
-- test/factories/docker_registry.rb
-- test/functionals/container_controller_test.rb
-- test/functionals/containers_steps_controller_test.rb
-- test/integration/container_steps_test.rb
-- test/integration/container_test.rb
-- test/test_plugin_helper.rb
 - test/units/container_test.rb
-- test/units/containers_service_test.rb
 - test/units/docker_registry_test.rb
 - test/units/registry_api_test.rb
+- test/units/containers_service_test.rb
+- test/test_plugin_helper.rb
+- test/integration/container_steps_test.rb
+- test/integration/container_test.rb
 homepage: http://github.com/theforeman/foreman-docker
 licenses:
 - GPL-3
@@ -141,21 +148,22 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Provision and manage Docker containers and images from Foreman
 test_files:
+- test/functionals/api/v2/containers_controller_test.rb
 - test/functionals/containers_steps_controller_test.rb
 - test/functionals/container_controller_test.rb
 - test/factories/docker_registry.rb