foreman_docker 0.2.0 → 1.0.0

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

@@ -2,7 +2,7 @@
 
 <% if authorized? %>
   <% title_actions button_group(link_to_if_authorized _("New container"), hash_for_new_container_path,
-                                :class => 'btn-success' ) %>
+                                                      :class => 'btn-success') %>
 <% end %>
 
 <ul class="nav nav-tabs" data-tabs="tabs">
@@ -22,10 +22,15 @@
     <% else %>
       <div class="tab-pane" id="<%= resource.name %>">
     <% end %>
-    <%= render 'list', :containers => resource.vms.to_a
-                                     .sort_by(&:name).paginate(:page     => params[:page],
-                                                               :per_page => 10),
-                       :resource   => resource %>
+    <% if resource.test_connection %>
+      <%= render 'list', :containers => resource.vms,
+                 :resource           => resource %>
+    <% else %>
+      <div class="alert alert-warning">
+        <%= (_("Error connecting with the compute resource: <strong> %s </strong>") % resource.errors.messages[:base]).html_safe %>
+      </div>
+    <% end %>
     </div>
   <% end %>
-</div>
+  </div>
+</div>

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

@@ -12,12 +12,12 @@
               <td><%= @container.in_fog.name %></td>
             </tr>
             <tr>
-              <td><%= _('Image') %></td>
-              <td><%= @container.image.image_id %> </td>
+              <td><%= _('Image Repository') %></td>
+              <td><%= @container.repository_name %> </td>
             </tr>
             <tr>
-              <td><%= _('Tag') %></td>
-              <td><%= @container.tag.tag %> </td>
+              <td><%= _('Image Tag') %></td>
+              <td><%= @container.tag %> </td>
             </tr>
             <tr>
               <td><%= _('IP Address') %></td>
@@ -43,7 +43,26 @@
               <td><%= _('Exposed ports') %></td>
               <td><%= @container.in_fog.exposed_ports %> </td>
             </tr>
-
+            <tr>
+              <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| %>
+                  <% pair = environment_variable.split("=") %>
+                    <tr>
+                      <td><b><%= pair.first %></b></td>
+                      <td><i><%= pair.second %></i></td>
+                    </tr>
+                  <% end %>
+                </table>
+              </td>
+            </tr>
+            <% Taxonomy.enabled_taxonomies.each do |taxonomy| %>
+              <tr>
+                <td><%= _(taxonomy.humanize) %></td>
+                <td><%= link_to_taxonomies(@container.send(:"#{taxonomy}")).html_safe %> </td>
+              </tr>
+            <% end %>
             <tr>
               <td><%= _('Running on') %></td>
               <td><%= link_to @container.compute_resource,
@@ -121,8 +140,8 @@
         </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') } %>
+          <%= text_field :commit, :tag, { :class => "col-sm-8",
+                                          :placeholder => _('latest') } %>
         </div>
         <div class="form-group">
           <%= label_tag "commit[author]", _("Author"), :class=>"col-sm-2 control-label" %>

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

@@ -9,7 +9,7 @@
       </a>
     <% end %>
     <%= button_tag(:type => 'submit', :class => "btn btn-primary pull-right") do %>
-      <% if step == :environment %>
+      <% if last_step? %>
         <%= _("Submit") %>
       <% else %>
         <%= _("Next") %>

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

@@ -1,5 +1,5 @@
 <%= render :layout => 'title', :locals => { :step => 3 } do %>
-  <%= form_for @container, :url => wizard_path, :method => :put do |f| %>
+  <%= form_for @configuration, :url => wizard_path, :method => :put do |f| %>
     <h3><%= _("Basic options") %></h3>
     <%= text_f f, :name,       :size => 'col-md-4' %>
     <%= text_f f, :command,    :size => 'col-md-4' %>
@@ -11,7 +11,7 @@
       :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') %>
+      :help_block => link_to(_("learn more about CPU shares"), 'http://docs.fedoraproject.org/en-US/Fedora/17/html/Resource_Management_Guide/sec-cpu.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 %>

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

@@ -1,9 +1,22 @@
 <%= render :layout => 'title', :locals => { :step => 4 } do %>
-  <%= form_for @container, :url => wizard_path, :method => :put do |f| %>
-    <%= checkbox_f f, :tty, :help_inline => _('Allocate a pseudo-tty'), :label => _('TTY') %>
-    <%= checkbox_f f, :attach_stdin,  :label => _('Attach STDIN') %>
-    <%= checkbox_f f, :attach_stdout, :label => _('Attach STDOUT') %>
-    <%= checkbox_f f, :attach_stderr, :label => _('Attach STDERR') %>
-    <%= render :partial => 'form_buttons' %>
+  <%= form_for @environment, :url => wizard_path, :method => :put do |f| %>
+    <div class='row'>
+      <div class='col-md-6 col-md-push-7'>
+        <h3><%= _("Shell") %></h3>
+        <%= checkbox_f f, :tty, :help_inline => _('Allocate a pseudo-tty'), :label => _('TTY') %>
+        <%= checkbox_f f, :attach_stdin,  :label => _('Attach STDIN') %>
+        <%= checkbox_f f, :attach_stdout, :label => _('Attach STDOUT') %>
+        <%= checkbox_f f, :attach_stderr, :label => _('Attach STDERR') %>
+      </div>
+      <div class='col-md-6 col-md-pull-6'>
+        <h3><%= _("Environment variables") %></h3>
+        <%= f.fields_for :environment_variables, @environment.environment_variables do |builder| %>
+          <%= render 'foreman_docker/common_parameters/environment_variable', :f => builder %>
+        <% end %>
+        <%= link_to_add_fields(_("Add environment variable"), f, :environment_variables,
+                               'foreman_docker/common_parameters/environment_variable') %>
+      </div>
+   </div>
+   <%= render :partial => 'form_buttons' %>
   <% end %>
 <% end %>

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

@@ -1,45 +1,64 @@
 <%= 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>
-  </ul>
+<%= render :layout => 'title', :locals => { :step => 2 } do %>
+    <ul class="nav nav-tabs" data-tabs="tabs">
+      <li class="active"><a href="#hub" data-toggle="tab" id="hub_tab">
+        <span class="glyphicon glyphicon-cloud-download"></span>
+        <%= _("Docker hub") %>
+      </a></li>
+      <li><a href="#registry" data-toggle="tab" id="registry_tab">
+        <span class="glyphicon glyphicon-cloud-download"></span>
+        <%= _("External registry") %>
+      </a></li>
+    </ul>
 
-  <div class="tab-content">
-    <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>
-      <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' %>
-    </div>
-  </div>
+    <%= form_for @image, :class => 'form-horizontal', :url => wizard_path, :method => :put do |f| %>
+        <div class="tab-content">
+          <div class="tab-pane active" id="hub">
+          </div>
+          <div class="tab-pane" id="registry">
+            <div class="input-group col-md-6">
+              <%= select_registry f %>
+            </div>
+          </div>
+          <div>
+            <div class="form-group col-md-6">
+              <%= label_tag "image_id", _('Search'), :class=>"col-sm-2 control-label" %>
+              <div class="input-group">
 
-  <% end %>
+                <%= auto_complete_docker_search('docker_container_wizard_states_image[repository_name]', '',
+                                         :'data-url'  => auto_complete_repository_name_image_search_path(@image.compute_resource_id),
+                                         :value       => f.object.repository_name.present? ? f.object.repository_name : '',
+                                         :id          => :search,
+                                         :focus_on_load => true,
+                                         :placeholder => _('Find your favorite container, e.g: centos')) %>
+                <span class="input-group-addon glyphicon" id="search-addon"></span>
+                <span class="input-group-btn">
+                  <%= button_tag(:class      => 'btn btn-default',
+                                 :type       => 'button',
+                                 :id         => 'search_repository',
+                                 :'data-url' => search_repository_image_search_path(@image.compute_resource_id),
+                                 :onclick    => 'searchRepo(this)') do %>
+                    <span class="glyphicon glyphicon-search"></span>
+                  <% end %>
+                </span>
+              </div>
+            </div>
+            <%= text_f f, :tag,
+                          :id         => 'tag',
+                          :'data-url' => auto_complete_image_tag_image_search_path(@image.compute_resource_id) %>
+            <div class="col-md-12">
+              <div id='searching_spinner' class='col-md-offset-3 hide'>
+                <span id='waiting_text'>
+                </span>
+                <%= image_tag('/assets/spinner.gif', :id => 'loading_repositories_indicator') %>
+              </div>
+              <div id='repository_search_results'>
+              </div>
+            </div>
+          </div>
+          <%= render :partial => 'form_buttons' %>
+        </div>
+    <% end %>
 <% end %>

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

@@ -1,18 +1,35 @@
 <%= render :layout => 'title', :locals => { :step => 1 } do %>
-  <%= form_for @container, :url => wizard_path, :method => :put do |f| %>
-    <div>
+<%= form_for @preliminary, :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-tasks"></span>
+      <%= _("Compute resource") %>
+    </a></li>
+    <% Taxonomy.enabled_taxonomies.each do |taxonomy| %>
+      <li><a href="#<%= taxonomy %>" data-toggle="tab">
+        <span class="glyphicon glyphicon-<%= taxonomy_icon(taxonomy) %>">
+        </span>
+        <%= _(taxonomy.humanize) %>
+      </a></li>
+    <% end %>
+  </ul>
+  <div class="tab-content">
+    <div class="tab-pane active" id="primary">
       <% if @container_resources.present? %>
         <h3><%= _("Resource selection") %></h3>
         <%= _("Where do you want to deploy your container?:") %>
         <hr>
-        <%= select_f f, :compute_resource_id, @container_resources, :id, :to_label, {}, { :label => _('Deploy on') } %>
+        <%= 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 %>
         </div>
       <% end %>
     </div>
-
+    <%= render "taxonomies/loc_org_tabs", :f => f, :obj => @preliminary %>
+  </div>
+  <% if @container_resources.present? %>
     <%= render :partial => 'form_buttons' %>
   <% end %>
 <% end %>
+<% end %>

data/app/views/foreman_docker/common_parameters/_environment_variable.html.erb

@@ -0,0 +1,18 @@
+<div class='fields'>
+  <table class="table table-bordered table-hover table-striped">
+    <tr class="form-group <%= 'error' if f.object.errors.any? %>">
+      <td><%= f.text_field(:name,  :class => "form-control",
+                                   :placeholder => _("Name, e.g: PING_HOST")) %></td>
+      <td><%= f.text_field(:value, :class => "form-control",
+                                   :placeholder => _("Value, e.g: theforeman.org")) %></td>
+      <td style='vertical-align: middle' class='text-center'>
+        <span class="help-block">
+          <%= link_to_remove_fields('', f) %>
+        </span>
+      </td>
+      <span class="help-block">
+        <%= f.object.errors.full_messages.to_sentence %>
+      </span>
+    </tr>
+  </table>
+</div>

data/app/views/image_search/_repository_search_results.html.erb

@@ -0,0 +1,12 @@
+<% repositories.each do |repository| %>
+    <h3><%= link_to repository['name'], '#', :onclick => 'repoSelected(this)' %></h3>
+    <p>
+      <%= '<span class="glyphicon glyphicon-certificate" title="Official"></span>'.html_safe if repository['is_official'] %>
+      <%= '<span class="glyphicon glyphicon-thumbs-up" title="Trusted"></span>'.html_safe    if repository['is_trusted'] %>
+      <span class="glyphicon glyphicon-star"></span> <%= repository['star_count'] %>
+    </p>
+    <p>
+      <%= trunc(repository['description']) %>
+      <%= link_to '<span class="glyphicon glyphicon-share"></span>'.html_safe, hub_url(repository), :target => '_blank' %>
+    </p>
+<% end %>

data/app/views/registries/_form.html.erb

@@ -0,0 +1,26 @@
+<%= form_for @registry, :url => (@registry.new_record? ? registries_path : registry_path(:id => @registry.id)) do |f| %>
+    <%= base_errors_for @registry %>
+    <ul class="nav nav-tabs" data-tabs="tabs">
+      <li class="active"><a href="#primary" data-toggle="tab"><%= _("Registry") %></a></li>
+      <% if show_location_tab? %>
+          <li><a href="#locations" data-toggle="tab"><%= _("Locations") %></a></li>
+      <% end %>
+      <% if show_organization_tab? %>
+          <li><a href="#organizations" data-toggle="tab"><%= _("Organizations") %></a></li>
+      <% end %>
+    </ul>
+
+    <div class="tab-content">
+      <div class="tab-pane active" id="primary">
+        <%= text_f   f, :name, :help_inline => _("Registry name") %>
+        <%= text_f   f, :url, :help_inline => _("Registry url") %>
+        <%= text_f   f, :description, :help_inline => _("Describing of the registry") %>
+        <%= text_f   f, :username, :help_inline => _("Username used to access the registry") %>
+        <%= password_f   f, :password, :help_inline => _("Password used for authentication to the registry") %>
+      </div>
+
+      <%= render 'taxonomies/loc_org_tabs', :f => f, :obj => @registry %>
+    </div>
+
+    <%= submit_or_cancel f %>
+<% end %>

data/app/views/registries/edit.html.erb

@@ -0,0 +1,3 @@
+<% title _("Edit Registry") %>
+
+<%= render :partial => 'form' %>

data/app/views/registries/index.html.erb

@@ -0,0 +1,28 @@
+<% title _("Registries") %>
+
+<% if authorized? %>
+    <% title_actions button_group(link_to_if_authorized _("New Registry"), hash_for_new_registry_path,
+                                                        :class => 'btn-success' ) %>
+<% end %>
+
+<table class="table table-bordered table-striped table-condensed" data-table="inline">
+  </thead>
+  <tr>
+    <th class="text-center"><%= sort :name, :as => _("Name") %></th>
+    <th class="hidden-tablet hidden-xs text-center"><%= sort :url, :as => _("Url") %></th>
+    <th class="hidden-tablet hidden-xs text-center"><%= _("Description") %></th>
+    <th></th>
+  </tr>
+  </thead>
+
+  <% @registries.each do |r| %>
+      <tr>
+        <td><%= link_to_if_authorized trunc(r.name), hash_for_edit_registry_path(:id => r).merge(:auth_object => r, :authorizer => authorizer) %></td>
+        <td class="hidden-tablet hidden-xs text-center"><%= trunc(r.url) %></td>
+        <td class="hidden-tablet hidden-xs text-center"><%= trunc(r.description) %></td>
+        <td><%= display_delete_if_authorized hash_for_registry_path(:id => r).merge(:auth_object => r, :authorizer => authorizer), :confirm => _("Delete %s?") % r.name %></td>
+      </tr>
+  <% end %>
+</table>
+
+<%= will_paginate_with_info @registries %>

data/app/views/registries/new.html.erb

@@ -0,0 +1,3 @@
+<% title _("New Registry") %>
+
+<%= render :partial => 'form' %>

data/config/routes.rb

@@ -3,8 +3,17 @@ Rails.application.routes.draw do
     member do
       post :commit
     end
+  end
+
+  resources :wizard_states, :only => [] do
     resources :steps, :controller => 'containers/steps', :only => [:show, :update]
-    get :auto_complete_image, :on => :member
-    get :auto_complete_image_tags, :on => :member
   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
+  end
+
+  resources :registries, :only => [:index, :new, :create, :update, :destroy, :edit]
 end

data/db/migrate/20141024163003_create_docker_registries.rb

@@ -0,0 +1,22 @@
+class CreateDockerRegistries < ActiveRecord::Migration
+  def change
+    create_table :docker_registries do |t|
+      t.string :url
+      t.string :name
+      t.integer :id
+      t.string :description
+      t.timestamps
+    end
+
+    create_table :docker_image_docker_registries do |t|
+      t.integer :id
+      t.integer :docker_registry_id
+      t.integer :docker_image_id
+    end
+
+    add_index :docker_image_docker_registries,
+              [:docker_registry_id, :docker_image_id],
+              :name => 'by_docker_image_and_registry',
+              :unique => true
+  end
+end

data/db/migrate/20141120123003_add_user_credentials_to_docker_registries.rb

@@ -0,0 +1,6 @@
+class AddUserCredentialsToDockerRegistries < ActiveRecord::Migration
+  def change
+    add_column :docker_registries, :username, :string
+    add_column :docker_registries, :password, :string
+  end
+end

data/db/migrate/20141209182008_remove_docker_tables.rb

@@ -0,0 +1,72 @@
+class RemoveDockerTables < ActiveRecord::Migration
+  class DockerImage
+  end
+
+  class DockerTag
+  end
+
+  def up
+    change_table :containers do |t|
+      t.string :repository_name
+      t.string :tag
+      t.belongs_to :registry
+    end
+
+    Container.reset_column_information
+    Container.all do |container|
+      image = DockerImage.find(container.docker_image_id)
+      container.update_attribute(:repository_name, image.image_id)
+
+      tag = DockerTag.find(container.docker_tag_id)
+      container.update_attribute(:tag, tag.tag)
+    end
+    remove_foreign_key :containers, :name => :containers_docker_image_id_fk
+    remove_foreign_key :containers, :name => :containers_docker_tag_id_fk
+    remove_column :containers, :docker_image_id
+    remove_column :containers, :docker_tag_id
+
+    # these tables might have foreign keys from plugins like katello so use cascade
+    cascade_drop(:docker_images)
+    cascade_drop(:docker_tags)
+    cascade_drop(:docker_image_docker_registries)
+  end
+
+  def down
+    remove_column :containers, :repository_name
+    remove_column :containers, :registry_id
+    remove_column :containers, :tag
+    add_column :containers, :docker_image_id, :integer
+    add_column :containers, :docker_tag_id, :integer
+
+    create_table :docker_images do |t|
+      t.string  :image_id
+      t.integer :size
+      t.timestamps
+    end
+    create_table :docker_tags do |t|
+      t.string  :tag
+      t.references :docker_image, :null => false
+      t.timestamps
+    end
+    create_table :docker_image_docker_registries do |t|
+      t.integer :id
+      t.integer :docker_registry_id
+      t.integer :docker_image_id
+    end
+  end
+
+  def cascade_drop(table_name)
+    case connection.adapter_name.downcase.to_sym
+    when :mysql, :mysql2
+      execute "SET FOREIGN_KEY_CHECKS=0"
+      execute "DROP TABLE #{table_name}"
+      execute "SET FOREIGN_KEY_CHECKS=1"
+    when :pg, :postgresql
+      execute "DROP TABLE #{table_name} CASCADE"
+    when :sqlite
+      execute "DROP TABLE #{table_name}"
+    else
+      fail NotImplementedError, "Unknown adapter type '#{connection.adapter_name.downcase.to_sym}'"
+    end
+  end
+end