picsolve_docker_builder 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ec84ff2c54bd70531b955c0433b32fc7612a096
-  data.tar.gz: 9721fdeccf7b27d7440119c40d3fc657e3b4b9e4
+  metadata.gz: de22e1ddc1a2ea198d0c73b3d7666ff4478e1ebd
+  data.tar.gz: 5081529443f27fc76d6cae03744a88b064129857
 SHA512:
-  metadata.gz: 4673382c5b8cdd99de881ae5522f815b5021d3f4f30fecdc7bbe4511dd8fbc3b1846241ad881125f50787ca0437abcddcc420a3c7a275fb6c46199c98bb4c7df
-  data.tar.gz: c14aa9c909bbf0927e9283ade875b24363b341b5d6a13a0e365971d95f38a26d51466176835d482beb0d3348cf314caf8c3d7b2b0fc5543c7fd61d638e4b3c1d
+  metadata.gz: b8f4cc5d83cd5677610d743262e9a4751e8165a06d76af80c73b8932eb1ffc87f00a4cb46ad25f84ae18dc780f8b99c2e870776f0530dfc930fa44b6fc06aeee
+  data.tar.gz: fbfa2a3eae645fea2af45289fa5e174817a4f157fac45de0cfd294d2e139a8b0207adac0e8a96383538960ac59767300762c087cc0d7eb09bd3c1ddd13967966

data/lib/picsolve_docker_builder/composer/container.rb

@@ -1,7 +1,9 @@
 require 'picsolve_docker_builder/base'
-require 'picsolve_docker_builder/composer/registry'
+require 'picsolve_docker_builder/helpers/registry'
 require 'picsolve_docker_builder/composer/requirements'
 
+Registry = PicsolveDockerBuilder::Helpers::Registry
+
 module PicsolveDockerBuilder
   module Composer
     # Represents an container in an namespace

data/lib/picsolve_docker_builder/frame.rb

@@ -1,10 +1,12 @@
 require 'picsolve_docker_builder/helpers/ssh_auth_forwarding'
-require 'picsolve_docker_builder/composer/registry'
+require 'picsolve_docker_builder/helpers/registry'
 require 'picsolve_docker_builder/base'
 require 'docker'
 require 'logger'
 require 'psych'
 
+Registry = PicsolveDockerBuilder::Helpers::Registry
+
 module PicsolveDockerBuilder
   # Docker image building template
   # rubocop:disable Metrics/ClassLength
@@ -105,7 +107,7 @@ module PicsolveDockerBuilder
         repotag = "#{dest_image_name}:#{tag}"
         log.info "pushing image with #{repotag}"
         @docker_build.push(
-          Composer::Registry.creds,
+          Registry.creds,
           tag: tag
         ) do |resp|
           resp = JSON.parse resp
@@ -378,7 +380,7 @@ module PicsolveDockerBuilder
       log.debug "pulling image '#{image_name}' from registry"
       Docker::Image.create(
         { 'fromImage' => image_name },
-        Composer::Registry.creds
+        Registry.creds
       )
       log.debug "building asset image from '#{image_name}'"
       asset_image_build

data/lib/picsolve_docker_builder/version.rb

@@ -1,4 +1,4 @@
 # version
 module PicsolveDockerBuilder
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picsolve_docker_builder
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Christian Simon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -259,7 +259,6 @@ files:
 - lib/picsolve_docker_builder/builder/file.rb
 - lib/picsolve_docker_builder/composer/composer.rb
 - lib/picsolve_docker_builder/composer/container.rb
-- lib/picsolve_docker_builder/composer/registry.rb
 - lib/picsolve_docker_builder/composer/requirements.rb
 - lib/picsolve_docker_builder/composer/requirements/base.rb
 - lib/picsolve_docker_builder/composer/requirements/context.rb

data/lib/picsolve_docker_builder/composer/registry.rb

@@ -1,84 +0,0 @@
-require 'picsolve_docker_builder/base'
-require 'excon'
-require 'json'
-require 'base64'
-
-module PicsolveDockerBuilder
-  module Composer
-    # This represents a remote registry, that is queried for
-    # for informations about images
-    class Registry
-      include PicsolveDockerBuilder::Base
-
-      attr_reader :config
-
-      def self.dockercfg_path
-        File.expand_path '~/.dockercfg'
-      end
-
-      def self.dockercfg
-        JSON.parse(
-          File.open(
-            dockercfg_path
-          ).read
-        )
-      end
-
-      def self.creds(*args)
-        auth = Base64.decode64(
-          get_login_basic(
-            *args
-          )
-        ).split(':')
-        {
-          'username' => auth[0],
-          'password' => auth[1]
-        }
-      end
-
-      def self.get_login_basic(registry = 'docker.picsolve.net')
-        dockercfg[registry]['auth']
-      rescue StandardError
-        nil
-      end
-
-      def self.login_basic(*args)
-        auth = creds(*args)
-        Base64.encode64("#{auth['username']}:#{auth['password']}").delete("\n")
-      end
-
-      def self.repo_tag_unique(image_name)
-        repo_tag = image_name.split(%r{/})[1..-1].join('/')
-        repo_tag_split = repo_tag.split(/:/)
-        repo = repo_tag_split[0]
-        tag = repo_tag_split[1] || 'latest'
-
-        headers = {}
-        headers['Authorization'] = "Basic #{login_basic}" \
-          unless login_basic.nil?
-
-        connection = Excon.new(
-          'https://docker.picsolve.net',
-          headers: headers
-        )
-        response = connection.get(path: "/v1/repositories/#{repo}/tags")
-
-        tags = JSON.parse(response.body)
-
-        hash = tags[tag]
-
-        tags.each do |t, h|
-          next if h != hash
-          next if t == tag
-          next unless t.match(/jenkins-[0-9]+/)
-          return {
-            tag_unique: "#{image_name.split(':').first}:#{t}",
-            hash: hash
-          }
-        end
-
-        fail "Can not find a uniqe tag for #{image_name}"
-      end
-    end
-  end
-end