foreman_docker 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebb80b781a7f84fa7654be95ec8d3404a4164931
-  data.tar.gz: 27d789e92be3bd4b2e10078808f8769aece0874c
+  metadata.gz: c16b711b658dfe65317085cac2406cb5797cb7eb
+  data.tar.gz: d895b63f9b5a822e9e9124a2ddc07acac9008860
 SHA512:
-  metadata.gz: 5a9d5ffaf42b7a30a2a67f41ee5250dba09da5f18ba7e92e02ffe120791de1c5558b7b1b458c2f9e50a48e778dc0efd4e5d6972225345787ea3e8a88c2afb553
-  data.tar.gz: bd2b7877e5fd9e3c2c95a8991b0c9f189b67cc8d82def3d2e43442f0afb47ffd443664a6a991fa35a3b5fec3fc2cc58ac1a6bfad8272dfd4c7877c9f04342f52
+  metadata.gz: 2bdd5e1a7cd1807ff3f8273e869110f3c4310cf1d39184e195be90ccb73552d5478d1b4c11942d3c7301ad5be7ff6c70ccb1edfbd147f5bc2889de6026cc151b
+  data.tar.gz: 5d245182ed0511904f31e49979ae45b239e53563c8bd4adca5902d416a2130424e4cd473693a2b0bf4487914649e5c9966b522ca9d80f8bc5ad14ca3814c02f3

data/README.md

@@ -86,6 +86,16 @@ That's it. You're now ready to create and manage containers in your new Docker c
 | >= 1.6         | 0.1.0 - 0.2.0   |
 | >= 1.7         | 1.0.0 - 2.1.1   |
 | >= 1.7         | 3.0.0+          |
+| >= 1.15        | 3.1.0+          |
+
+## Docker Registry API Compatibility
+
+| Plugin version | Registry API version |
+| ---------------:| --------------:|
+| <  3.1.0        | [v1](http://docs.master.dockerproject.org/v1.7/reference/api/registry_api/)             |
+| >= 3.1.0        | [v1](http://docs.master.dockerproject.org/v1.7/reference/api/registry_api/), [v2](https://docs.docker.com/registry/spec/api/)*****    |
+
+_*** Note:** API v2 as default and v1 to fall back on._
 
 See extras/RELEASE.md for more detailed information on compatibility and releases.
 
@@ -124,4 +134,3 @@ 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/container_image_search.js

@@ -0,0 +1,203 @@
+function ContainerImageSearch() {
+  this.initialize = function (registryType) {
+    this.registryType = registryType;
+    this.form = $('form[data-registry="' + this.registryType + '"]');
+    this.inputs = {
+      image: this.getInput('image'),
+      tag: this.getInput('tag')
+    };
+    this.results = this.form.find('.registry-search-results')
+    this.resultsList = this.results.find('.registry-search-results-list');
+    this.resultsList.on('click', this.selectImage.bind(this));
+
+    this.searchButton = this.form.find('.image-search-button');
+    this.searchButton.on('click', function (event) {
+      event.preventDefault();
+      this.fullResultList();
+    }.bind(this))
+
+    this.setupInputs();
+  };
+
+  this.registryId = function () {
+    return $('#docker_container_wizard_states_image_registry_id').val();
+  };
+
+  this.getInput = function (input) {
+    return this.form.find('input[data-' + input + ']:first');
+  };
+
+  this.getFormGroup = function (input) {
+    return input.closest('.form-group');
+  }
+
+  this.getSpinner = function (input) {
+    return this.getFormGroup(input).find('.autocomplete-status');
+  };
+
+  this.getInlineHelp = function (input) {
+    return this.getFormGroup(input).find('.help-inline');
+  }
+
+  this.validRequest = function () {
+    return (this.registryType == 'registry' && this.registryId() != '' ||
+           this.registryType == 'hub' && this.registryId() == '') &&
+           this.inputs.image.val() != '';
+  }
+
+  this.getAutocompleteResults = function (tag, input, callback, params) {
+    if(!this.validRequest())
+      return;
+
+    var spinner = this.getSpinner(tag),
+        imageName = this.inputs.image.val(),
+        tagsOnly = tag.data('tag'),
+        params = $.extend({
+          registry: this.registryType,
+          search: tagsOnly ? imageName + ':' + input.term : input.term,
+          registry_id: this.registryId(),
+          tags: tagsOnly
+        }, params)
+
+    spinner.removeClass('pficon pficon-error-circle-o pficon-ok')
+           .addClass('spinner spinner-xs').show();
+
+    $.getJSON(tag.data("url"), params, function (data) {
+      this.setAutocompleteConfirmationStatus(tag, data)
+      callback(data);
+    }.bind(this))
+    .error(function(result) {
+      notify('<p>' + result.responseText + '</p>', 'danger');
+    })
+  };
+
+  this.fullResultList = function (event) {
+    if(!this.validRequest())
+      return;
+
+    var list = this.resultsList,
+        input = this.inputs.image;
+
+    input.autocomplete('disable')
+    list.empty();
+
+    $.ajax({
+      type:'get',
+      dataType:'html',
+      url: this.searchButton.data('url'),
+      data: {
+        registry: this.registryType,
+        search: input.val(),
+        registry_id: this.registryId()
+      },
+      success: function (result) {
+        list.html(result).show();
+      },
+      error: function(result) {
+        notify('<p>' + result.responseText + '</p>', 'danger');
+    }});
+  };
+
+  this.selectImage = function (event) {
+    var link = $(event.target);
+    if (link.hasClass('repository-name')) {
+      event.preventDefault();
+      this.inputs.image
+        .val(link.text())
+      this.inputs.tag.val('').focus();
+    }
+  };
+
+  this.setAutocompleteConfirmationStatus = function (field, results) {
+    var spinner = this.getSpinner(field),
+        inlineHelp = this.getInlineHelp(field),
+        resultType = field.data('tag') ? 'Tag' : 'Image',
+        result = results.filter(function (item) {
+          return item.value == field.val();
+        }),
+        available = result.length > 0;
+
+    inlineHelp.find('.autocomplete-confirmation').remove()
+    spinner.removeClass('spinner spinner-xs pficon-error-circle-o pficon-ok');
+
+    if (field.val() == '')
+      return;
+
+    if (available) {
+      spinner.addClass('pficon pficon-ok');
+    } else {
+      spinner.addClass('pficon pficon-error-circle-o');
+    };
+
+    inlineHelp.append(this.confirmationWrapper(resultType, field.val(), available));
+  };
+
+  this.confirmationWrapper = function(resultType, value, available) {
+    var wrapper = '<span class="autocomplete-confirmation">&nbsp;' +
+                  resultType + ' <strong>' + value + '</strong> is '
+
+    if (!available)
+      wrapper += '<strong>not</strong>';
+
+    return wrapper + ' available.</span>';
+  };
+
+  this.confirmAutocomplete = function (field, autocomplete) {
+    this.getAutocompleteResults(field, { term: field.val() }, function (results) {
+      this.setAutocompleteConfirmationStatus(field, results)
+    }.bind(this));
+  };
+
+  this.setupAutoCompleteInput = function (field) {
+    var options = $.extend({
+      source: function (input, callback) {
+        this.getAutocompleteResults(field, input, callback)
+      }.bind(this),
+      delay: 500,
+      minLength: field.data('min-length')
+    }, options);
+
+    field.autocomplete(options);
+
+    field.on('blur', function () {
+      this.confirmAutocomplete(field)
+    }.bind(this))
+  };
+
+  this.setupInputs = function () {
+    var image = this.inputs.image,
+        tag = this.inputs.tag;
+
+    this.setupAutoCompleteInput(tag)
+    this.setupAutoCompleteInput(image)
+
+    // Trigger search on pressing enter in image search
+    image.on("keypress", function(e) {
+      if (e.keyCode == 13) {
+        e.preventDefault();
+        this.fullResultList()
+      }
+    }.bind(this))
+
+    image.on('focus', function () {
+      image.autocomplete('enable')
+    });
+
+    tag.on('focus', function () {
+      if (tag.val() == '')
+        tag.autocomplete('search', '');
+    });
+  };
+
+  this.initialize.apply(this, arguments);
+  return this;
+}
+
+$(document).ready(function() {
+  var hubSearch = new ContainerImageSearch('hub'),
+      registrySearch = new ContainerImageSearch('registry');
+
+  $('#hub_tab').click( function() {
+      $('#docker_container_wizard_states_image_registry_id').val('');
+  });
+});

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

@@ -0,0 +1,15 @@
+function toggleVerifySSL () {
+  var urlField = $('#docker_registry_url'),
+      verifySSLField = $('#docker_registry_verify_ssl'),
+      verifySSLFormGroup = verifySSLField.closest('.form-group');
+
+  if (/^https/.test(urlField.val())) {
+    verifySSLFormGroup.show();
+  } else {
+    verifySSLFormGroup.hide();
+  };
+};
+
+$(document).ready(function () {
+  $('#docker_registry_url').on('change', toggleVerifySSL)
+})

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

@@ -1,3 +1,7 @@
 #image-confirmation {
   margin-left: 10px;
 }
+.small-gutter {
+  padding-right: 10px;
+  padding-left: 10px;
+}

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

@@ -4,7 +4,7 @@ module Foreman::Controller::Parameters::DockerRegistry
   class_methods do
     def docker_registry_params_filter
       Foreman::ParameterFilter.new(::DockerRegistry).tap do |filter|
-        filter.permit :name, :url, :username, :password, :description,
+        filter.permit :name, :url, :username, :password, :description, :verify_ssl,
                       :location_ids => [], :organization_ids => []
       end
     end

data/app/controllers/image_search_controller.rb

@@ -1,38 +1,13 @@
 class ImageSearchController < ::ApplicationController
-  def auto_complete_repository_name
-    catch_network_errors do
-      available = image_search_service.available?(params[:search])
-      render :text => available.to_s
-    end
-  end
-
-  def auto_complete_image_tag
-    catch_network_errors do
-      tags = image_search_service.search({
-        term: params[:search],
-        tags: 'true'
-      })
-
-      respond_to do |format|
-        format.js do
-          render :json => prepare_for_autocomplete(tags)
-        end
-      end
-    end
-  end
-
   def search_repository
     catch_network_errors do
-      repositories = image_search_service.search({
-        term: params[:search].split(':').first,
-        tags: 'false'
-      })
+      tags_enabled = params[:tags] || 'false'
+      result = image_search_service.search(term: params[:search], tags: tags_enabled)
 
       respond_to do |format|
-        format.js do
-          render :partial => 'repository_search_results',
-                 :locals  => { :repositories => repositories,
-                               :use_hub => use_hub? }
+        format.js { render json: prepare_for_autocomplete(result) }
+        format.html do
+          render partial: 'repository_search_results', locals: { repositories: result }
         end
       end
     end
@@ -51,13 +26,9 @@ class ImageSearchController < ::ApplicationController
            :status => 500
   end
 
-  def use_hub?
-    @registry.nil?
-  end
-
   def action_permission
     case params[:action]
-    when 'auto_complete_repository_name', 'auto_complete_image_tag', 'search_repository'
+    when 'search_repository'
       :search_repository
     else
       super

data/app/helpers/container_steps_helper.rb

@@ -42,7 +42,6 @@ module ContainerStepsHelper
     name.split.last
   end
 
-
   def model_for(registry_type)
     if active_tab.to_s == registry_type.to_s
       @docker_container_wizard_states_image

data/app/models/container.rb

@@ -1,4 +1,4 @@
-class Container < ActiveRecord::Base
+class Container < ApplicationRecord
   include Authorizable
   include Taxonomix
 

data/app/models/docker_container_wizard_state.rb

@@ -1,4 +1,4 @@
-class DockerContainerWizardState < ActiveRecord::Base
+class DockerContainerWizardState < ApplicationRecord
   has_one :preliminary, :class_name => DockerContainerWizardStates::Preliminary,
                         :dependent => :destroy, :validate => true, :autosave => true
   has_one :image, :class_name => DockerContainerWizardStates::Image,

data/app/models/docker_container_wizard_states/configuration.rb

@@ -1,5 +1,5 @@
 module DockerContainerWizardStates
-  class Configuration < ActiveRecord::Base
+  class Configuration < ApplicationRecord
     self.table_name_prefix = 'docker_container_wizard_states_'
     belongs_to :wizard_state, :class_name => DockerContainerWizardState,
                               :foreign_key => :docker_container_wizard_state_id

data/app/models/docker_container_wizard_states/environment.rb

@@ -1,5 +1,5 @@
 module DockerContainerWizardStates
-  class Environment < ActiveRecord::Base
+  class Environment < ApplicationRecord
     self.table_name_prefix = 'docker_container_wizard_states_'
     belongs_to :wizard_state, :class_name => DockerContainerWizardState
 

data/app/models/docker_container_wizard_states/image.rb

@@ -1,5 +1,5 @@
 module DockerContainerWizardStates
-  class Image < ActiveRecord::Base
+  class Image < ApplicationRecord
     self.table_name_prefix = 'docker_container_wizard_states_'
     belongs_to :wizard_state, :class_name => DockerContainerWizardState,
                               :foreign_key => :docker_container_wizard_state_id

data/app/models/docker_container_wizard_states/preliminary.rb

@@ -1,5 +1,5 @@
 module DockerContainerWizardStates
-  class Preliminary < ActiveRecord::Base
+  class Preliminary < ApplicationRecord
     include Taxonomix
 
     self.table_name_prefix = 'docker_container_wizard_states_'

data/app/models/docker_parameter.rb

@@ -1,4 +1,4 @@
-class DockerParameter < ActiveRecord::Base
+class DockerParameter < ApplicationRecord
   extend FriendlyId
   friendly_id :key
   include Parameterizable::ByIdName

data/app/models/docker_registry.rb

@@ -1,4 +1,4 @@
-class DockerRegistry < ActiveRecord::Base
+class DockerRegistry < ApplicationRecord
   include Authorizable
   include Taxonomix
   include Encryptable
@@ -44,14 +44,18 @@ class DockerRegistry < ActiveRecord::Base
 
   def api
     @api ||= Service::RegistryApi.new(url: url, user: username,
-                                      password: password)
+                                      password: password, verify_ssl: verify_ssl)
   end
 
   private
 
   def attempt_login
     api.ok?
-  rescue => e
-    errors.add(:base, _('Unable to log in to this Docker Registry - %s') % e)
+  rescue Excon::Error::Certificate
+    message = 'Unable to verify certificate.\
+              (Disable "Verify ssl" if you still want to use this Docker Registry)'
+    errors.add(:base, _(message))
+  rescue => error
+    errors.add(:base, _('Unable to log in to this Docker Registry - %s') % error)
   end
 end

data/app/models/foreman_docker/docker.rb

@@ -42,11 +42,13 @@ module ForemanDocker
       ::Docker::Image.all({ 'filter' => filter }, docker_connection)
     end
 
-    def tags_for_local_image(image)
-      image.info['RepoTags'].map do |image_tag|
+    def tags_for_local_image(image, tag = nil)
+      result = image.info['RepoTags'].map do |image_tag|
         _, tag = image_tag.split(':')
         tag
       end
+      result = filter_tags(result, tag) if tag
+      result
     end
 
     def exist?(name)
@@ -127,6 +129,12 @@ module ForemanDocker
 
     protected
 
+    def filter_tags(result, query)
+      result.select do |tag_name|
+        tag_name['name'] =~ /^#{query}/
+      end
+    end
+
     def docker_command
       yield
     rescue Excon::Errors::Error, ::Docker::Error::DockerError => e