foreman_docker 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04dedd7aef67d8c8ef5299bd13fba4bd06477b48
-  data.tar.gz: 3f6d66e39d798470d169d00a4455b7701b44c92f
+  metadata.gz: 312b5ebf35209421ab37d4f6ce21b42f5c8a4f4c
+  data.tar.gz: a62f11d57a4d7eaadade21338983bf135883b7e8
 SHA512:
-  metadata.gz: 2375f44e73e5a5bfc0a7e0cc213295fb6be2e831a8759deb73a846f5ebe565880ce6519d83d2827c4b758deadd1413977bb25d22a6a1b612bcf7d5a66b5f7698
-  data.tar.gz: f5626d2ad14734c0337b304c5b85555e88d7116a9883127f570e49c98c5a54b0aa887153afad9237f984da1fe09852a8086f0cb9d21c4288aa1a7d3b951e5a81
+  metadata.gz: 5bbd89c9d4efe80997326ebc6fb46487144e443628de9dfeca2ee8e319bbd0cadee4c79ac9bf75d97eda83ccebb3f3457bc1301955610d11e4573d198581e438
+  data.tar.gz: 9a93d2c256eec38df60fa1d4d3c83c94f99641cef7f3960978f6c2da2ab4edc215c7ab3aa0098a4b7358cfd958d29e8ce02c1f80750e6fa81353d5b153d21df5

data/app/controllers/containers_controller.rb

@@ -16,13 +16,13 @@ class ContainersController < ::ApplicationController
 
   def new
     redirect_to wizard_state_step_path(:wizard_state_id => DockerContainerWizardState.create.id,
-                                       :id              => :preliminary)
+                                       :id => :preliminary)
   end
 
   def destroy
     if container_deletion
       process_success(:success_redirect => containers_path,
-                      :success_msg      => (_("Container %s is being deleted.") %
+                      :success_msg => (_("Container %s is being deleted.") %
                                             @deleted_identifier))
     else
       process_error(:redirect => containers_path)
@@ -35,10 +35,10 @@ class ContainersController < ::ApplicationController
   end
 
   def commit
-    Docker::Container.get(@container.uuid).commit(:author  => params[:commit][:author],
-                                                  :repo    => params[:commit][:repo],
-                                                  :tag     => params[:commit][:tag],
-                                                  :comment => params[:commit][:comment])
+    ForemanDocker::Docker.get_container(@container).commit(:author  => params[:commit][:author],
+                                                           :repo => params[:commit][:repo],
+                                                           :tag => params[:commit][:tag],
+                                                           :comment => params[:commit][:comment])
 
     process_success :success_redirect => :back,
                     :success_msg      => _("%{container} commit was successful") %

data/app/helpers/containers_helper.rb

@@ -15,9 +15,7 @@ module ContainersHelper
   end
 
   def link_to_taxonomies(taxonomies)
-    taxonomies.map do |taxonomy|
-      link_to(taxonomy)
-    end.join(' ')
+    taxonomies.map { |taxonomy| link_to(taxonomy) }.join(" ")
   end
 
   def container_link_hash(container, resource)
@@ -93,4 +91,12 @@ module ContainersHelper
       trunc(text, length)
     end
   end
+
+  def processes(container)
+    ForemanDocker::Docker.get_container(container).top
+  end
+
+  def logs(container, opts = {})
+    ForemanDocker::Docker.get_container(container).logs(opts)
+  end
 end

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

@@ -9,6 +9,13 @@ module FogExtensions
           downcase_hash_keys(image)
         end
       end
+
+      def downcase_hash_keys(hash, k = [])
+        if hash.is_a?(Hash)
+          return hash.reduce({}) { |a, e| a.merge! downcase_hash_keys(e[-1], k + [e[0]]) }
+        end
+        { k.join('_').gsub(/([a-z])([A-Z])/, '\1_\2').downcase => hash }
+      end
     end
   end
 end

data/app/models/foreman_docker/docker.rb

@@ -8,6 +8,11 @@ module ForemanDocker
       ComputeResource.model_name
     end
 
+    def self.get_container(container)
+      conn = container.compute_resource.docker_connection
+      ::Docker::Container.get(container.uuid, {}, conn)
+    end
+
     def capabilities
       [:image]
     end
@@ -29,12 +34,11 @@ module ForemanDocker
     end
 
     def available_images
-      client.images.all
+      ::Docker::Image.all({}, docker_connection)
     end
 
     def local_images(filter = '')
-      client # initialize Docker-Api
-      ::Docker::Image.all('filter' => filter)
+      ::Docker::Image.all({ 'filter' => filter }, docker_connection)
     end
 
     def tags_for_local_image(image)
@@ -45,11 +49,11 @@ module ForemanDocker
     end
 
     def exist?(name)
-      ::Docker::Image.exist?(name)
+      ::Docker::Image.exist?(name, {}, docker_connection)
     end
 
     def image(id)
-      client.image_get(id)
+      ::Docker::Image.get(id, {}, docker_connection)
     end
 
     def tags(image_name)
@@ -76,14 +80,14 @@ module ForemanDocker
       options = vm_instance_defaults.merge(args)
       logger.debug("Creating container with the following options: #{options.inspect}")
       docker_command do
-        ::Docker::Container.create(options)
+        ::Docker::Container.create(options, docker_connection)
       end
     end
 
     def create_image(args = {})
       logger.debug("Creating docker image with the following options: #{args.inspect}")
       docker_command do
-        ::Docker::Image.create(args)
+        ::Docker::Image.create(args, credentials, docker_connection)
       end
     end
 
@@ -94,7 +98,7 @@ module ForemanDocker
 
     def console(uuid)
       test_connection
-      container = ::Docker::Container.get(uuid)
+      container = ::Docker::Container.get(uuid, {}, docker_connection)
       {
         :name       => container.info['Name'],
         'timestamp' => Time.now.utc,
@@ -102,15 +106,28 @@ module ForemanDocker
       }
     end
 
+    def api_version
+      ::Docker.version(docker_connection)
+    end
+
+    def authenticate!
+      ::Docker.authenticate!(credentials, docker_connection)
+    end
+
     def test_connection(options = {})
       super
-      client.present?
+      api_version
+      credentials.empty? ? true : authenticate!
     # This should only rescue Fog::Errors, but Fog returns all kinds of errors...
     rescue => e
       errors[:base] << e.message
       false
     end
 
+    def docker_connection
+      @docker_connection ||= ::Docker::Connection.new(url, credentials)
+    end
+
     protected
 
     def docker_command
@@ -141,8 +158,12 @@ module ForemanDocker
       @client ||= ::Fog::Compute.new(opts)
     end
 
-    def api_version
-      @api_version ||= client.send(:client).api_version
+    def credentials
+      @credentials ||= {}.tap do |options|
+        options[:username] = user if user.present?
+        options[:password] = password if password.present?
+        options[:email] = email if email.present?
+      end
     end
   end
 end

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

@@ -87,9 +87,8 @@
     </ul>
     <div id="myTabContent" class="tab-content">
       <div class="tab-pane active in" id="processes">
-        <% processes = Docker::Container.get(@container.uuid).top %>
         <div class='accordion' id='accordion'>
-          <% processes.each do |process| %>
+          <% processes(@container).each do |process| %>
           <div>
             <h2>
               <a href='#<%= process['PID'] %>-index'
@@ -108,7 +107,9 @@
         </div>
       </div>
       <div class="tab-pane" id="logs">
-        <pre class="terminal terminal-output pre-scrollable"><code><%= Docker::Container.get(@container.uuid).logs(:stdout => true, :tail => 100) %></code></pre>
+        <pre class="terminal terminal-output pre-scrollable"><code>
+          <%= logs(@container, :stdout => true, :tail => 100) %>
+        </code></pre>
       </div>
     </div>
     <% else %>

data/lib/foreman_docker/version.rb

@@ -1,3 +1,3 @@
 module ForemanDocker
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
 end

data/test/functionals/{container_controller_test.rb → containers_controller_test.rb}

@@ -31,7 +31,8 @@ class ContainersControllerTest < ActionController::TestCase
     commit_hash = { :author => 'a', :repo => 'b', :tag => 'c', :comment => 'd' }
 
     mock_container = mock
-    ::Docker::Container.expects(:get).with(container.uuid).returns(mock_container)
+    ::Docker::Container.expects(:get).with(container.uuid, anything, anything)
+      .returns(mock_container)
     mock_container.expects(:commit).with(commit_hash)
 
     post :commit, { :commit => commit_hash,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_docker
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Daniel Lobato, Amos Benari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -45,100 +45,100 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/views/compute_resources/form/_docker.html.erb
-- app/views/compute_resources/show/_docker.html.erb
-- app/views/image_search/_repository_search_results.html.erb
+- 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/api/v2/containers_controller.rb
+- 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/images.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/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/main.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/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.html.erb
-- app/views/containers/steps/preliminary.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/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/new.html.erb
-- app/views/registries/_form.html.erb
-- app/views/registries/index.html.erb
+- app/views/containers/steps/environment.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/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
+- app/views/registries/_form.html.erb
+- app/views/registries/edit.html.erb
+- app/views/registries/index.html.erb
+- app/views/registries/new.html.erb
 - config/routes.rb
-- db/migrate/20141018110810_add_uuid_to_containers.rb
-- db/migrate/20141028164206_change_memory_in_container.rb
+- db/migrate/20140930175337_add_email_to_compute_resource.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/20141120123003_add_user_credentials_to_docker_registries.rb
-- db/migrate/20140930175337_add_email_to_compute_resource.rb
+- db/migrate/20141009011026_add_attributes_to_container.rb
 - db/migrate/20141010173220_create_docker_images.rb
-- db/migrate/20150122011747_add_katello_flag_to_docker_wizard_image.rb
+- db/migrate/20141018110810_add_uuid_to_containers.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/factories/compute_resources.rb
+- test/factories/containers.rb
+- test/factories/docker_registry.rb
 - test/functionals/api/v2/containers_controller_test.rb
+- test/functionals/containers_controller_test.rb
 - test/functionals/containers_steps_controller_test.rb
 - test/functionals/image_search_controller_test.rb
-- test/functionals/container_controller_test.rb
-- test/factories/docker_registry.rb
-- test/factories/compute_resources.rb
-- test/factories/containers.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
@@ -159,22 +159,23 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Provision and manage Docker containers and images from Foreman
 test_files:
+- test/factories/compute_resources.rb
+- test/factories/containers.rb
+- test/factories/docker_registry.rb
+- test/test_plugin_helper.rb
 - test/functionals/api/v2/containers_controller_test.rb
+- test/functionals/containers_controller_test.rb
 - test/functionals/containers_steps_controller_test.rb
 - test/functionals/image_search_controller_test.rb
-- test/functionals/container_controller_test.rb
-- test/factories/docker_registry.rb
-- test/factories/compute_resources.rb
-- test/factories/containers.rb
+- test/integration/container_steps_test.rb
+- test/integration/container_test.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
+has_rdoc: