foreman_docker 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11781ae40d79526d1ce98c52dddbb9341c9aa211
-  data.tar.gz: 87df5bd21364b87d937dda8d3de05cf9bae0b303
+  metadata.gz: 2e7371179124d8fa414db7e60fbcab48110a4372
+  data.tar.gz: 339e3c491804ae9432363136be744a48346af11c
 SHA512:
-  metadata.gz: 0c70da7838dc58dc17fb4e9bbd716fe0d3d34d3bba529923ad5d62968db33f58331760fd662806cb123df7922409e19009a5f8ddaeed51a12d9991db10d8eeeb
-  data.tar.gz: 5cde392c952ca19d530f17a8cac8e92ecb89f612143cce0d445ebe2e87e06b88895a25e28fd69025723e80a4f4c56bdd0af63822bb8c3bf0c999832aaa5abd09
+  metadata.gz: 08356581341a4c80c452ae75dc851ef81c9ec51c61df9106c44d99d8f157ceda5bdf1f0d325e6182983f8591d602f1998618f0058704a3791105465eb0a4d044
+  data.tar.gz: b0c79637f96a572eadf4d82c2a322669d8152690e4a956be0696bd06ee32b82ab93d87dca0f5891799dc1cf58671f5043283a12d33d98a7d2ffe16a204e7ce00

data/README.md

@@ -1,6 +1,39 @@
 # Foreman Docker Plugin
 
-This plugin enables provisioning and managing Docker containers and images in Foreman.
+```foreman_docker``` enables provisioning and managing of [Docker](http://docker.com) containers and images in [Foreman](http://github.com/theforeman/foreman), all of that under the GPL v3+ license.
+
+* Website: [TheForeman.org](http://theforeman.org)
+* ServerFault tag: [Foreman](http://serverfault.com/questions/tagged/foreman)
+* Issues: [foreman_docker Redmine](http://projects.theforeman.org/projects/docker/issues)
+* Wiki: [Foreman wiki](http://projects.theforeman.org/projects/foreman/wiki/About)
+* Community and support: #theforeman for general support, #theforeman-dev for development chat in [Freenode](irc.freenode.net)
+* Mailing lists:
+    * [foreman-users](https://groups.google.com/forum/?fromgroups#!forum/foreman-users)
+    * [foreman-dev](https://groups.google.com/forum/?fromgroups#!forum/foreman-dev)
+
+## Features
+
+* Special view with logs and processes of Foreman managed containers
+    ![](http://i.imgur.com/D21bdgj.png)
+    ![](http://i.imgur.com/XnrPTZC.png)
+* Wizard for container creation and cgroups configuration
+    ![Select a docker image](http://i.imgur.com/IoMuNnr.png)
+    ![Cgroups configuration](http://i.imgur.com/74d99Tf.png)
+* Commit and upload containers: creates an image with the status of your current container
+    ![Commit and upload to the docker hub](http://i.imgur.com/coF5Y0L.png)
+* Container listing and basic CRUD operations
+    ![](http://i.imgur.com/DPcaHkZ.png)
+
+### Planned
+* [Kubernetes](https://github.com/GoogleCloudPlatform/kubernetes/) integration
+* Events stream ([#8037](http://projects.theforeman.org/issues/8037))
+* Tight integration between Docker hosts [Atomic](http://www.projectatomic.io/) and [CoreOS](http://coreos.com/) and containers ([#7653](http://projects.theforeman.org/issues/7653), [#7652](http://projects.theforeman.org/issues/7652))
+* Quickstart images - pre-supplied images and configuration ([#7869](http://projects.theforeman.org/issues/7869))
+* Environment variables support ([#8226](http://projects.theforeman.org/issues/8226))
+* Support to expose ports during creation or at runtime ([#7864](http://projects.theforeman.org/issues/7864))
+* Links to other containers ([#7866](http://projects.theforeman.org/issues/7866))
+* API ([#7874](http://projects.theforeman.org/issues/7874))
+* [Hammer CLI](http://github.com/theforeman/hammer-cli-foreman) support ([#8227](http://projects.theforeman.org/issues/8227))
 
 ## Installation
 
@@ -8,19 +41,62 @@ Please see the Foreman manual for appropriate instructions:
 
 * [Foreman: How to Install a Plugin](http://theforeman.org/manuals/latest/index.html#6.1InstallaPlugin)
 
-The gem name is "foreman_docker".
+### Red Hat, CentOS, Fedora, Scientific Linux (rpm)
 
-RPM users can install the "ruby193-rubygem-foreman_docker" or "rubygem-foreman_docker" packages.
+Set up the repo as explained in the link above, then run
+
+    # yum install ruby193-rubygem-foreman_docker
+
+### Debian, Ubuntu (deb)
+
+Set up the repo as explained in the link above, then run
+
+    # apt-get install ruby-foreman-docker
+
+### Bundle (gem)
+
+Add the following to bundler.d/Gemfile.local.rb in your Foreman installation directory (/usr/share/foreman by default)
+
+    $ gem 'foreman_docker'
+
+Then run `bundle install` and `foreman-rake db:migrate` from the same directory
+
+--------------
+
+To verify that the installation was successful, go to Foreman, top bar **Administer > About** and check 'foreman_docker' shows up in the **System Status** menu under the Plugins tab. You should also see a **'Containers'** button show up in the top bar, similar to this
+
+![](http://i.imgur.com/Ug14Ktl.png)
+
+## Configuration
+
+Go to **Infrastructure > Compute Resources** and click on "New Compute Resource".
+
+Choose the **Docker provider**, and fill in all the fields. User name, password, and email are used so that Docker clients such as Foreman can make the host download images from the Docker hub. Your password will be encrypted in the database.
+
+That's it. You're now ready to create and manage containers in your new Docker compute resource.
 
 ## Compatibility
 
-| Foreman Version | Plugin Version |
+| Foreman | Plugin |
 | ---------------:| --------------:|
-| >=  1.5         | 0.0.1          |
+| >= 1.5         | 0.0.1 - 0.0.3   |
+| >= 1.6         | 0.1.0 - 0.2.0   |
 
-## Testing
+## Known bugs
+* Unsaved new containers leave a dangling container object in the database
+* Power operations redirect to compute resource container view even for managed container
 
-Run `rake test:docker:test` from your Foreman directory to run the test suite.
+## How to contribute?
+
+Generally, follow the [Foreman guidelines](http://theforeman.org/contribute.html). For code-related contributions, fork this project and send a pull request with all changes. Some things to keep in mind:
+* [Follow the rules](http://theforeman.org/contribute.html#SubmitPatches) about commit message style and create a Redmine issue. Doing this right will help reviewers to get your contribution merged faster.
+* [Rubocop](https://github.com/bbatsov/rubocop) will analyze your code, you can run it locally with `rake rubocop`.
+* All of our pull requests run the full test suite in our [Jenkins CI system](http://ci.theforeman.org/). Please include tests in your pull requests for any additions or changes in functionality
+
+
+### Testing
+
+Run `rake test:docker` from your Foreman directory to run the test suite.
 
 ## Latest code
 
@@ -44,3 +120,4 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
+

data/app/assets/javascripts/foreman_docker/image_step.js

@@ -0,0 +1,56 @@
+$(document).ready(function() {
+  var tag = $('#tag');
+  tag.autocomplete({
+    source: [],
+    delay: 500,
+    minLength: 0
+  }).focus( function() {
+    $(this).data("uiAutocomplete").search($(this).val());
+  });
+
+  var target = $('#search');
+  autoCompleteImage(target);
+  target.autocomplete({
+    source: function( request, response ) { autoCompleteImage(target); },
+    delay: 500,
+    minLength: 1
+  });
+});
+
+function autoCompleteImage(item) {
+  $.ajax({
+    type:'get',
+    url: $(item).attr('data-url'),
+    data:'search=' + item.val(),
+    success:function (result) {
+      if(result == 'true'){
+        $('#search-addon').attr('title', 'Image found in the compute resource');
+        $('#search-addon').removeClass('glyphicon-remove');
+        $('#search-addon').css('color', 'lightgreen');
+        $('#search-addon').addClass('glyphicon-ok');
+        setAutocompleteTags();
+      } else {
+        $('#search-addon').attr('title', 'Image NOT found in the compute resource');
+        $('#search-addon').removeClass('glyphicon-ok');
+        $('#search-addon').css('color', 'red');
+        $('#search-addon').addClass('glyphicon-remove');
+        $('#tag').autocomplete('option', 'source', []);
+      }
+    }
+  });
+}
+
+function setAutocompleteTags() {
+  var tag = $('#tag');
+  tag.addClass('tags-autocomplete-loading');
+  tag.val('');
+  var source = [];
+  $.getJSON( tag.data("url"), { search: $('#search').val() },
+      function(data) {
+        tag.removeClass('tags-autocomplete-loading');
+        $.each( data, function(index, value) {
+          source.push({label: value.label, value: value.value});
+        });
+      });
+  tag.autocomplete('option', 'source', source);
+}

data/app/assets/stylesheets/foreman_docker/autocomplete.css.scss

@@ -0,0 +1,3 @@
+.tags-autocomplete-loading {
+  background: white url('/assets/spinner.gif') right center no-repeat;
+}

data/app/controllers/containers/steps_controller.rb

@@ -21,13 +21,20 @@ module Containers
       when :preliminary
         @container.update_attribute(:compute_resource_id, params[:container][:compute_resource_id])
       when :image
-        @container.image = params[:image]
-        @container.update_attributes(params[:container])
+        @container.update_attributes!(
+            :image => (image = DockerImage.find_or_create_by_image_id!(params[:image])),
+            :tag => DockerTag.find_or_create_by_tag_and_docker_image_id!(params[:container][:tag],
+                                                                         image.id))
       when :configuration
         @container.update_attributes(params[:container])
       when :environment
         @container.update_attributes(params[:container])
-        @container.uuid = start_container.id
+        if (response = start_container)
+          @container.uuid = response.id
+        else
+          process_error(:object => @container.compute_resource, :render => 'environment')
+          return
+        end
       end
       render_wizard @container
     end
@@ -49,7 +56,7 @@ module Containers
     end
 
     def start_container
-      @container.compute_resource.create_vm(@container.parametrize)
+      @container.compute_resource.create_container(@container.parametrize)
     end
   end
 end

data/app/controllers/containers_controller.rb

@@ -1,5 +1,8 @@
 class ContainersController < ::ApplicationController
-  before_filter :find_resource, :only => [:show]
+  before_filter :find_container, :only => [:show,
+                                           :auto_complete_image,
+                                           :auto_complete_image_tags,
+                                           :commit]
 
   def index
     @container_resources = allowed_resources.select { |cr| cr.provider == 'Docker' }
@@ -20,7 +23,8 @@ class ContainersController < ::ApplicationController
   def destroy
     if resource_deletion
       process_success(:success_redirect => containers_path,
-                      :success_msg      => _("Container #{@deleted_identifier} is being deleted."))
+                      :success_msg      => (_("Container %s is being deleted.") %
+                                            @deleted_identifier))
     else
       process_error(:redirect => containers_path)
     end
@@ -31,8 +35,51 @@ class ContainersController < ::ApplicationController
   def show
   end
 
+  def auto_complete_image
+    if @container.compute_resource.exist?(params[:search])
+      render :text => 'true'
+    else
+      render :text => 'false'
+    end
+  end
+
+  def auto_complete_image_tags
+    images = @container.compute_resource.all_images(params[:search]).map do |image|
+      image.info['RepoTags'].map do |image_tag|
+        _, tag = image_tag.split(':')
+        { :label => CGI.escapeHTML(tag), :value => CGI.escapeHTML(tag) }
+      end
+    end
+    render :json => images.flatten
+  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])
+
+    process_success :success_redirect => :back,
+                    :success_msg      => _("%{container} commit was successful") %
+                                         { :container => @container }
+  rescue => e
+    process_error :redirect => :back, :error_msg => _("Failed to commit %{container}: %{e}") %
+                                                    { :container => @container, :e => e }
+  end
+
   private
 
+  def action_permission
+    case params[:action]
+    when 'auto_complete_image', 'auto_complete_image_tags'
+      :view
+    when 'commit'
+      :commit
+    else
+      super
+    end
+  end
+
   def resource_deletion
     # Unmanaged container - only present in Compute Resource
     if params[:compute_resource_id].present?
@@ -59,4 +106,14 @@ class ContainersController < ::ApplicationController
   def allowed_resources
     ComputeResource.authorized(:view_compute_resources)
   end
+
+  # To be replaced by find_resource after 1.6 support is deprecated
+  def find_container
+    if params[:id].blank?
+      not_found
+      return
+    end
+    @container = Container.authorized("#{action_permission}_#{controller_name}".to_sym)
+                          .find(params[:id])
+  end
 end

data/app/helpers/containers_helper.rb

@@ -33,12 +33,7 @@ module ContainersHelper
     @compute_resource = container.compute_resource
     title_actions(
         button_group(
-          link_to_if_authorized(_("Commit"), hash_for_container_path(:id => container)
-                                  .merge(:auth_object => container,
-                                         :permission  => 'commit_containers'),
-                                :title => _('Saves differences between image' \
-                                            'and current state of container' \
-                                            'as a new image'))
+          link_to(_('Commit'), '#commit-modal', :'data-toggle' => 'modal')
         ),
         button_group(vm_power_action(container.in_fog)),
         button_group(
@@ -51,4 +46,9 @@ module ContainersHelper
         )
     )
   end
+
+  def auto_complete_search(name, val, options = {})
+    addClass options, 'form-control'
+    text_field_tag(name, val, options)
+  end
 end

data/app/models/container.rb

@@ -1,4 +1,6 @@
 class Container < ActiveRecord::Base
+  include Authorizable
+
   belongs_to :compute_resource
   belongs_to :image, :class_name => 'DockerImage', :foreign_key => 'docker_image_id'
   belongs_to :tag,   :class_name => 'DockerTag',   :foreign_key => 'docker_tag_id'
@@ -8,19 +10,13 @@ class Container < ActiveRecord::Base
                   :attach_stdout, :attach_stderr, :tag, :uuid
 
   def parametrize
-    { :name => name, :image => tag.tag.blank? ? image.image_id : "#{image.image_id}:#{tag.tag}",
-      :tty  => tty, :memory => memory, :cmd => command.nil? ? '' : command.split(','),
-      :attach_stdout => attach_stdout, :attach_stdout => attach_stdout,
-      :attach_stderr => attach_stderr, :cpushares => cpu_shares, :cpuset => cpu_set }
-  end
-
-  def image=(image_id)
-    self[:docker_image_id] = DockerImage.find_or_create_by_image_id!(image_id).id
-  end
-
-  def tag=(tag_name)
-    self[:docker_tag_id] = DockerTag
-                          .find_or_create_by_tag_and_docker_image_id!(tag_name, image.id).id
+    { 'name'  => name, # key has to be lower case to be picked up by the Docker API
+      'Image' => tag.tag.blank? ? image.image_id : "#{image.image_id}:#{tag.tag}",
+      'Tty'          => tty,                    'Memory'       => memory,
+      'Entrypoint'   => entrypoint.try(:split), 'Cmd'          => command.try(:split),
+      'AttachStdout' => attach_stdout,          'AttachStdin'  => attach_stdin,
+      'AttachStderr' => attach_stderr,          'CpuShares'    => cpu_shares,
+      'Cpuset'       => cpu_set }
   end
 
   def in_fog

data/app/models/docker_image.rb

@@ -4,4 +4,6 @@ class DockerImage < ActiveRecord::Base
   has_many :containers
 
   attr_accessible :image_id, :size
+
+  validates :image_id, :presence => true, :uniqueness => true
 end

data/app/models/docker_tag.rb

@@ -3,5 +3,6 @@ class DockerTag < ActiveRecord::Base
 
   attr_accessible :tag, :image
 
+  validates :tag,   :presence => true, :uniqueness => { :scope => :docker_image_id }
   validates :image, :presence => true
 end

data/app/models/foreman_docker/docker.rb

@@ -20,34 +20,43 @@ module ForemanDocker
       super.merge(:mac => :mac)
     end
 
-    # FIXME
-    def max_cpu_count
-      8
-    end
-
     def max_memory
       16 * 1024 * 1024 * 1024
     end
 
     def available_images
-      client.images
+      client.images.all
+    end
+
+    def all_images(filter = '')
+      client # initialize Docker-Api
+      # we are using an older version of docker-api, which differs from the current
+      ::Docker::Image.all('filter' => filter)
+    end
+
+    def exist?(name)
+      ::Docker::Image.exist?(name)
     end
 
     def image(id)
-      client.image.get(id) || fail(ActiveRecord::RecordNotFound)
+      client.image_get(id)
+    end
+
+    def search(term = '')
+      client.images.image_search(:term => term)
     end
 
     def provider_friendly_name
       'Docker'
     end
 
-    def create_vm(args = {})
+    def create_container(args = {})
       options = vm_instance_defaults.merge(args)
-      logger.debug("creating Docker with the following options: #{options.inspect}")
-      client.servers.create options
-    rescue Excon::Errors::SocketError, Fog::Errors::Error => e
+      logger.debug("Creating container with the following options: #{options.inspect}")
+      ::Docker::Container.create(options)
+    rescue Excon::Errors::Error, ::Docker::Error::DockerError => e
       logger.debug "Fog error: #{e.message}\n " + e.backtrace.join("\n ")
-      errors.add(:base, e.message.to_s)
+      errors.add(:base, _("Error creating container. Check the Foreman logs: %s") % e.message.to_s)
       false
     end
 
@@ -56,6 +65,16 @@ module ForemanDocker
                                                    'cmd' => ['/bin/bash'])
     end
 
+    def console(uuid)
+      test_connection
+      container = ::Docker::Container.get(uuid)
+      {
+        :name       => container.info['Name'],
+        'timestamp' => Time.now.utc,
+        'output'    => container.logs(:stdout => true, :tail => 100)
+      }
+    end
+
     def test_connection(options = {})
       super
       client

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

@@ -32,4 +32,6 @@
   <% end %>
 </table>
 
-<%= will_paginate_with_info containers %>
+<!-- To be replaced by will_paginate_with_info after 1.6 support is deprecated -->
+<%= page_entries_info containers %>
+<%= will_paginate containers %>

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

@@ -102,3 +102,45 @@
     <% end %>
   </div>
 </div>
+
+<div id="commit-modal" class="modal fade">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h4 class="modal-title"><%= _('Commit this container state') %></h4>
+      </div>
+      <div class="modal-body">
+        This will save your current container state to an image.
+      <hr/>
+      <%= form_tag commit_container_path(:id => @container.id), :id => 'commit-form', :class => 'form-horizontal' do %>
+        <div class="form-group">
+          <%= label_tag "commit[repo]", _("Repo"), :class=>"col-sm-2 control-label" %>
+          <%= text_field :commit, :repo, { :class => "col-sm-8", :focus_on_load => true,
+                                           :placeholder => _('docker/my-committed-image') } %>
+        </div>
+        <div class="form-group">
+          <%= label_tag "commit[tag]", _("Tag"), :class=>"col-sm-2 control-label" %>
+          <%= text_field :commit, :tag, { :class => "col-sm-8", :focus_on_load => true,
+                                           :placeholder => _('latest') } %>
+        </div>
+        <div class="form-group">
+          <%= label_tag "commit[author]", _("Author"), :class=>"col-sm-2 control-label" %>
+          <%= text_field :commit, :author, { :class => "col-sm-8",
+                                             :placeholder => _('Foreman user <foremaner@theforeman.org>') } %>
+        </div>
+        <div class="form-group">
+          <%= label_tag "commit[comment]", _("Comment"), :class=>"col-sm-2 control-label" %>
+          <%= text_field :commit, :comment, { :class => "col-sm-8",
+                                              :placeholder => _('Description of the commit') } %>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-default" data-dismiss="modal"><%= _('Cancel') %></button>
+          <%= button_tag(:type => 'submit', :class => 'btn btn-primary') do %>
+            <%= _('Submit') %> <span class="glyphicon glyphicon-cloud-upload"></span>
+          <% end %>
+        </div>
+        <% end %>
+    </div>
+  </div>
+</div>

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

@@ -3,12 +3,16 @@
     <h3><%= _("Basic options") %></h3>
     <%= text_f f, :name,       :size => 'col-md-4' %>
     <%= text_f f, :command,    :size => 'col-md-4' %>
-    <%= text_f f, :entrypoint, :size => 'col-md-4' %>
+    <%= text_f f, :entrypoint, :size => 'col-md-4', :placeholder => '/bin/sh -c by default' %>
     <hr>
     <h3><%= _("Compute options") %></h3>
-    <%= selectable_f f, :cpu_set, 1..f.object.compute_resource.max_cpu_count, { }, :class => "col-md-2", :label => _('Cores') %>
-    <%= text_f f, :cpu_shares, :class => "col-md-2", :label => _('CPU shares') %>
-    <%= selectable_f f, :memory, memory_options(f.object.compute_resource.max_memory), { }, :class => "col-md-2", :label => _('Memory') %>
+    <%= text_f f, :cpu_set, :class => "col-md-2", :label => _('CPU sets'),
+      :placeholder => '0-2,16 represents CPUs 0, 1, 2, and 16.',
+      :help_block => link_to(_("learn more about CPU sets"), 'http://docs.fedoraproject.org/en-US/Fedora/17/html/Resource_Management_Guide/sec-cpuset.html') %>
+    <%= text_f f, :cpu_shares, :class => "col-md-2", :label => _('CPU shares'),
+      :placeholder => 'relative share of CPU time in cgroup',
+      :help_block => link_to(_("learn more about CPU shares"), 'http://docs.fedoraproject.org/en-US/Fedora/17/html/Resource_Management_Guide/sec-cpuset.html') %>
+    <%= text_f f, :memory, :class => "col-md-2", :label => _('Memory'), :placeholder => '512m limits container memory usage to 512 MB' %>
     <%= render :partial => 'form_buttons' %>
   <% end %>
 <% end %>

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

@@ -1,33 +1,45 @@
+<%= javascript 'foreman_docker/image_step' %>
+<%= stylesheet 'foreman_docker/autocomplete' %>
 <%= render :layout => 'title', :locals => { :step => 2 } do %>
+  <%= form_for @container, :url => wizard_path, :method => :put do |f| %>
+
   <ul class="nav nav-tabs" data-tabs="tabs">
     <li class="active"><a href="#primary" data-toggle="tab">
       <span class="glyphicon glyphicon-cloud-download"></span>
       <%= _("Docker hub") %>
     </a></li>
-    <li><a href="#others" data-toggle="tab">
-      <span class="glyphicon glyphicon-globe"></span>
-      <%= _("Others") %>
-    </a></li>
   </ul>
+
   <div class="tab-content">
-    <%= form_for @container, :url => wizard_path, :method => :put do |f| %>
-      <div class="tab-pane active" id="primary">
-        <div class="input-group col-md-6">
-          <%= auto_complete_search(:image, '',
-                                   :path  => 'containers_path',
-                                   :value =>  f.object.image.present? ? f.object.image.image_id : '',
-                                   :placeholder => ('Find your favorite container, e.g: centos:latest')) %>
-          <span class="input-group-btn">
-          <%= button_tag(:class => 'btn btn-default') do %>
+    <div class="tab-pane active" id="hub">
+      <div class="input-group col-md-6">
+        <%= auto_complete_search(:image, '',
+                                 :'data-url'  => auto_complete_image_container_path(@container),
+                                 :value       => f.object.image.present? ? f.object.image.image_id : '',
+                                 :id          => :search,
+                                 :placeholder => _('Find your favorite container, e.g: centos:latest')) %>
+        <span class="input-group-addon glyphicon" id="search-addon"></span>
+        <span class="input-group-btn">
+          <%= button_tag(:class => 'btn btn-default',
+                         :type => 'button',
+                         :onclick => "$('#search').trigger('focus')") do %>
             <span class="glyphicon glyphicon-search"></span>
             <%= _("Search") %>
           <% end %>
-          </span>
-        </div>
-        <hr>
-        <%= text_f f, :tag, :value => f.object.tag.present? ? f.object.tag.tag : '', :size => 'col-md-4' %>
+        </span>
+      </div>
+      <br/>
+      <div class="input-group col-md-6">
+        <%= text_f f, :tag,
+                      :size       => 'col-md-6',
+                      :value      => f.object.tag.present? ? f.object.tag.tag : '',
+                      :id         => 'tag',
+                      :'data-url' => auto_complete_image_tags_container_path(@container) %>
       </div>
+      <hr/>
       <%= render :partial => 'form_buttons' %>
-    <% end %>
+    </div>
   </div>
+
+  <% end %>
 <% end %>

data/config/routes.rb

@@ -1,5 +1,10 @@
 Rails.application.routes.draw do
   resources :containers, :only => [:index, :new, :show, :destroy] do
+    member do
+      post :commit
+    end
     resources :steps, :controller => 'containers/steps', :only => [:show, :update]
+    get :auto_complete_image, :on => :member
+    get :auto_complete_image_tags, :on => :member
   end
 end

data/db/migrate/20141028164206_change_memory_in_container.rb

@@ -0,0 +1,9 @@
+class ChangeMemoryInContainer < ActiveRecord::Migration
+  def up
+    change_column :containers, :memory, :string
+  end
+
+  def down
+    change_column :containers, :memory, :integer
+  end
+end

data/db/migrate/20141028164633_change_cpuset_in_container.rb

@@ -0,0 +1,9 @@
+class ChangeCpusetInContainer < ActiveRecord::Migration
+  def up
+    change_column :containers, :cpu_set, :string
+  end
+
+  def down
+    change_column :containers, :cpu_set, :integer
+  end
+end

data/lib/foreman_docker/engine.rb

@@ -3,22 +3,26 @@ require 'gettext_i18n_rails'
 require 'fog'
 require 'fog/fogdocker'
 require 'wicked'
+require 'docker'
 
 module ForemanDocker
   # Inherit from the Rails module of the parent app (Foreman), not the plugin.
   # Thus, inherits from ::Rails::Engine and not from Rails::Engine
   class Engine < ::Rails::Engine
+    engine_name 'foreman_docker'
+
     initializer 'foreman_docker.load_app_instance_data' do |app|
       app.config.paths['db/migrate'] += ForemanDocker::Engine.paths['db/migrate'].existent
     end
 
     initializer "foreman_docker.assets.precompile" do |app|
-      app.config.assets.precompile += ['foreman_docker/terminal.css']
+      app.config.assets.precompile += %w(foreman_docker/terminal.css foreman_docker/image_step.js)
     end
 
     initializer 'foreman_docker.configure_assets', :group => :assets do
-      SETTINGS[:foreman_docker_engine] =
-        { :assets => { :precompile => ['foreman_docker/terminal.css'] } }
+      SETTINGS[:foreman_docker] =
+        { :assets => { :precompile => ['foreman_docker/terminal.css',
+                                       'foreman_docker/image_step.js'] } }
     end
 
     initializer 'foreman_docker.register_gettext', :after => :load_config_initializers do
@@ -44,7 +48,10 @@ module ForemanDocker
         end
 
         security_block :containers do
-          permission :view_containers,    :containers         => [:index, :show]
+          permission :view_containers,    :containers         => [:index, :show,
+                                                                  :auto_complete_image,
+                                                                  :auto_complete_image_tags]
+          permission :commit_containers,  :containers         => [:commit]
           permission :create_containers,  :'containers/steps' => [:show, :update],
                                           :containers         => [:new]
           permission :destroy_containers, :containers         => [:destroy]

data/lib/foreman_docker/version.rb

@@ -1,3 +1,3 @@
 module ForemanDocker
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/test/functionals/container_controller_test.rb

@@ -24,4 +24,17 @@ class ContainersControllerTest < ActionController::TestCase
                        :id                  => container.id }, set_session_user
     assert_redirected_to containers_path
   end
+
+  test 'committing a managed container' do
+    container = FactoryGirl.create(:container)
+    request.env['HTTP_REFERER'] = container_path(:id => container.id)
+    commit_hash = { :author => 'a', :repo => 'b', :tag => 'c', :comment => 'd' }
+
+    mock_container = mock
+    ::Docker::Container.expects(:get).with(container.uuid).returns(mock_container)
+    mock_container.expects(:commit).with(commit_hash)
+
+    post :commit, { :commit => commit_hash,
+                    :id     => container.id }, set_session_user
+  end
 end

data/test/functionals/containers_steps_controller_test.rb

@@ -18,16 +18,30 @@ module Containers
       assert_equal DockerTag.find_by_tag('latest'), @container.tag
     end
 
-    test 'uuid of the created container is saved at the end of the wizard' do
-      Fog.mock!
-      @container.update_attribute(:image, 'centos')
-      @container.update_attribute(:tag,   'latest')
-      fake_container    = @container.compute_resource.create_vm
-      fake_container.id = SecureRandom.uuid
-      ForemanDocker::Docker.any_instance.expects(:create_vm).returns(fake_container)
-      put :update, { :id => :environment,
-                     :container_id => @container.id }, set_session_user
-      assert_equal fake_container.id, Container.find(@container.id).uuid
+    context 'container creation' do
+      setup do
+        @container.update_attribute(:image, (image = FactoryGirl.create(:docker_image,
+                                                                        :image_id => 'centos')))
+        @container.update_attribute(:tag, FactoryGirl.create(:docker_tag, :image => image,
+                                                                          :tag   => 'latest'))
+      end
+
+      test 'uuid of the created container is saved at the end of the wizard' do
+        Fog.mock!
+        fake_container = @container.compute_resource.send(:client).servers.first
+        ForemanDocker::Docker.any_instance.expects(:create_container).returns(fake_container)
+        put :update, { :id           => :environment,
+                       :container_id => @container.id }, set_session_user
+        assert_equal fake_container.id, Container.find(@container.id).uuid
+      end
+
+      test 'errors are displayed when container creation fails' do
+        Docker::Container.expects(:create).raises(Docker::Error::DockerError, 'some error')
+        put :update, { :id           => :environment,
+                       :container_id => @container.id }, set_session_user
+        assert_template 'environment'
+        assert_match(/some error/, flash[:error])
+      end
     end
 
     test 'wizard finishes with a redirect to the managed container' do

data/test/units/container_test.rb

@@ -0,0 +1,11 @@
+require 'test_plugin_helper'
+
+class ContainerTest < ActiveSupport::TestCase
+  test 'validations do not happen if inactive' do
+    FactoryGirl.build(:container)
+  end
+
+  test 'attributes are validated when active' do
+    FactoryGirl.build(:container)
+  end
+end

data/test/{models → units}/docker_image_test.rb

@@ -9,4 +9,15 @@ class DockerImageTest < ActiveSupport::TestCase
     refute DockerImage.exists?(image.id)
     refute DockerTag.exists?(tag.id)
   end
+
+  context 'validations' do
+    test 'without image_id is invalid' do
+      refute FactoryGirl.build(:docker_image, :image_id => '').valid?
+    end
+
+    test 'image_id has to be unique' do
+      old_image = FactoryGirl.create(:docker_image)
+      refute FactoryGirl.build(:docker_image, :image_id => old_image.image_id).valid?
+    end
+  end
 end

data/test/units/docker_tag_test.rb

@@ -0,0 +1,35 @@
+require 'test_plugin_helper'
+
+class DockerTagTest < ActiveSupport::TestCase
+  test 'creating fails if no image is provided' do
+    tag = FactoryGirl.build(:docker_tag, :image => nil)
+    refute tag.valid?
+    assert tag.errors.size >= 1
+  end
+
+  test 'creating succeeds if an image is provided' do
+    tag       = FactoryGirl.build(:docker_tag)
+    tag.image = FactoryGirl.build(:docker_image)
+
+    assert tag.valid?
+    assert tag.save
+  end
+
+  context 'validations' do
+    test 'tag has to be present' do
+      refute FactoryGirl.build(:docker_tag, :tag => '').valid?
+    end
+
+    test 'tag is unique within image scope' do
+      image          = FactoryGirl.create(:docker_image)
+      tag            = FactoryGirl.create(:docker_tag, :image => image)
+      duplicated_tag = FactoryGirl.build(:docker_tag,  :image => image, :tag => tag.tag)
+      refute duplicated_tag.valid?
+    end
+
+    test 'tag is not unique for different images' do
+      tag = FactoryGirl.create(:docker_tag)
+      assert FactoryGirl.build(:docker_tag, :tag => tag.tag).valid?
+    end
+  end
+end

metadata

@@ -1,85 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: foreman_docker
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Daniel Lobato, Amos Benari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-21 00:00:00.000000000 Z
+date: 2014-11-03 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: fog
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.13.6
+        version: '1.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.13.6
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: wicked
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: '0.26'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: '0.26'
 description: Provision and manage Docker containers and images from Foreman.
 email:
 - dlobatog@redhat.com, abenari@redhat.com
@@ -90,6 +62,8 @@ 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/containers/steps_controller.rb
 - app/controllers/containers_controller.rb
@@ -126,6 +100,8 @@ files:
 - db/migrate/20141009011026_add_attributes_to_container.rb
 - db/migrate/20141010173220_create_docker_images.rb
 - db/migrate/20141018110810_add_uuid_to_containers.rb
+- db/migrate/20141028164206_change_memory_in_container.rb
+- db/migrate/20141028164633_change_cpuset_in_container.rb
 - lib/foreman_docker.rb
 - lib/foreman_docker/engine.rb
 - lib/foreman_docker/tasks/test.rake
@@ -137,10 +113,10 @@ files:
 - test/factories/docker_tag.rb
 - test/functionals/container_controller_test.rb
 - test/functionals/containers_steps_controller_test.rb
-- test/models/container_test.rb
-- test/models/docker_image_test.rb
-- test/models/docker_tag_test.rb
 - test/test_plugin_helper.rb
+- test/units/container_test.rb
+- test/units/docker_image_test.rb
+- test/units/docker_tag_test.rb
 homepage: http://github.com/theforeman/foreman-docker
 licenses:
 - GPL-3
@@ -168,12 +144,12 @@ summary: Provision and manage Docker containers and images from Foreman
 test_files:
 - test/functionals/containers_steps_controller_test.rb
 - test/functionals/container_controller_test.rb
-- test/models/docker_image_test.rb
-- test/models/container_test.rb
-- test/models/docker_tag_test.rb
 - test/factories/docker_image.rb
 - test/factories/compute_resources.rb
 - test/factories/docker_tag.rb
 - test/factories/containers.rb
+- test/units/docker_image_test.rb
+- test/units/container_test.rb
+- test/units/docker_tag_test.rb
 - test/test_plugin_helper.rb
 has_rdoc: 

data/test/models/container_test.rb

@@ -1,36 +0,0 @@
-require 'test_plugin_helper'
-
-class ContainerTest < ActiveSupport::TestCase
-  context 'update attributes' do
-    setup do
-      @container = FactoryGirl.create(:container)
-    end
-
-    test 'update image reuses previously created image' do
-      assert_difference('DockerImage.count', 1) do
-        @container.update_attribute(:image, "centos")
-      end
-      assert_equal "centos", @container.image.image_id
-      refute_nil DockerImage.find_by_image_id("centos")
-
-      assert_difference('DockerImage.count', 1) do
-        @container.update_attribute(:image, "redis")
-      end
-      assert_equal "redis", @container.image.image_id
-
-      assert_difference('DockerImage.count', 0) do
-        @container.update_attribute(:image, "centos")
-      end
-    end
-
-    test "update tag uses container's associated image" do
-      @container.update_attribute(:image, 'centos')
-      assert_difference('DockerTag.count', 1) do
-        @container.update_attribute(:tag, 'latest')
-      end
-
-      assert_equal 'latest', @container.tag.tag
-      assert_equal @container.tag.image, @container.image
-    end
-  end
-end

data/test/models/docker_tag_test.rb

@@ -1,17 +0,0 @@
-require 'test_plugin_helper'
-
-class DockerTagTest < ActiveSupport::TestCase
-  test 'creating fails if no image is provided' do
-    tag = DockerTag.new(FactoryGirl.attributes_for(:docker_tag))
-    refute tag.valid?
-    assert tag.errors.size >= 1
-  end
-
-  test 'creating succeeds if an image is provided' do
-    tag       = FactoryGirl.build(:docker_tag)
-    tag.image = FactoryGirl.create(:docker_image)
-
-    assert tag.valid?
-    assert tag.save
-  end
-end