picsolve_docker_builder 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de22e1ddc1a2ea198d0c73b3d7666ff4478e1ebd
-  data.tar.gz: 5081529443f27fc76d6cae03744a88b064129857
+  metadata.gz: ff6dc295b2b3965dc57e04b6939e98c6e39028f6
+  data.tar.gz: fa1feef27218916f7c8ea253b43495645089c0fc
 SHA512:
-  metadata.gz: b8f4cc5d83cd5677610d743262e9a4751e8165a06d76af80c73b8932eb1ffc87f00a4cb46ad25f84ae18dc780f8b99c2e870776f0530dfc930fa44b6fc06aeee
-  data.tar.gz: fbfa2a3eae645fea2af45289fa5e174817a4f157fac45de0cfd294d2e139a8b0207adac0e8a96383538960ac59767300762c087cc0d7eb09bd3c1ddd13967966
+  metadata.gz: 610fb9fd6451749f7c11aaf818ca6a39d578617a45a65e915e25d69266d3c40f2114d76df9e76387283478d5650c63c086c6e1b8488c8fa8439108b9c028e265
+  data.tar.gz: 731f2eeafe0e07ca9bc4cae992eda2022a3c9a9add0b499321f1f874c25e14fd6f796e5a269bc040d44799e86450f99742a831293a153db3de84049016b4395e

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## [0.5.1] - 2016-03-07
+### Added
+- Support for storing/updateing tag information within config file
+- Support for multiple config files .docker-builder.*.yml
+
+### Fixes
+- Fixes regressions with v2 registry
+
+## [0.5.0] - 2016-02-03
+### Added
+- Support v2 registry
+
 ## [0.4.0] - 2016-01-11
 ### Added
 - Scala library build support

data/lib/picsolve_docker_builder/base.rb

@@ -47,6 +47,13 @@ module PicsolveDockerBuilder
       File.join(base_dir, config_file)
     end
 
+    # This should replace config_path pretty soon
+    def config_paths
+      [config_path] + Dir.glob(
+        config_path[0, config_path.length - 3] + '*.yml'
+      )
+    end
+
     def default_config
       {}
     end

data/lib/picsolve_docker_builder/composer/composer.rb

@@ -84,9 +84,9 @@ module PicsolveDockerBuilder
           return i
         end
 
-        # new approach
+        # new approach to handle config
         c = PicsolveDockerBuilder::Helpers::ConfigManager.new(
-          config_path,
+          config_paths,
           stage
         )
         c.containers(self)

data/lib/picsolve_docker_builder/composer/container.rb

@@ -2,8 +2,6 @@ require 'picsolve_docker_builder/base'
 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
@@ -17,10 +15,6 @@ module PicsolveDockerBuilder
         @composer = composer
       end
 
-      def repo_tag
-        config['image']
-      end
-
       def rc(kubernetes)
         @rcs = {} if @rcs.nil?
         @rcs[kubernetes] = kubernetes.rc(self) \
@@ -117,16 +111,24 @@ module PicsolveDockerBuilder
         }
       end
 
-      def repo_tag_hash_unique
-        @repo_tag_hash_unique ||= Registry.repo_tag_unique(config['image'])
+      def image_name_tag
+        "#{config['image']}:#{repo_tag}"
       end
 
-      def repo_tag_unique
-        repo_tag_hash_unique[:tag_unique]
+      def repo_tag
+        return config['tag'] if config.key? 'tag'
+        repo_tag_unique
       end
 
-      def hash
-        repo_tag_hash_unique[:hash]
+      def repo_tag_unique(label = 'latest')
+        image = PicsolveDockerBuilder::Helpers::Repository.new config['image']
+        log.info "Parse image string: #{image}"
+        @registry ||= PicsolveDockerBuilder::Helpers::Registry.new(
+          "https://#{image.registry}"
+        )
+        tag = @registry.unique_tag(config['image'], label)
+        log.info "Evaluate unique tag '#{tag}' for '#{label}'"
+        tag
       end
     end
   end

data/lib/picsolve_docker_builder/frame.rb

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

data/lib/picsolve_docker_builder/helpers/config_manager.rb

@@ -7,8 +7,13 @@ module PicsolveDockerBuilder
     # Parses the config file
     class ConfigManager
       include PicsolveDockerBuilder::Base
-      def initialize(path, stage)
-        @path = path
+      def initialize(paths, stage)
+        if paths.is_a?(Array)
+          @paths = paths
+        else
+          @paths = [paths]
+        end
+
         # TODO: Do this properly, this is a very very dirty hack
         stage = (
           !ENV['STAGE'].nil? &&
@@ -86,11 +91,14 @@ module PicsolveDockerBuilder
 
       def read
         @config = default
-        begin
-          yaml = Psych.load_file @path
-          @config = @config.deep_merge(yaml)
-        rescue Errno::ENOENT
-          raise "cannot find config at '#{path}'"
+        @paths.each do |file|
+          puts "my file is '#{@paths}'"
+          begin
+            yaml = Psych.load_file file
+            @config = @config.deep_merge(yaml)
+          rescue Errno::ENOENT
+            raise "cannot find config at '#{file}'"
+          end
         end
       end
     end

data/lib/picsolve_docker_builder/helpers/config_version_update.rb

@@ -0,0 +1,145 @@
+require 'picsolve_docker_builder/base'
+require 'psych'
+require 'git'
+
+module PicsolveDockerBuilder
+  module Helpers
+    # Parses the config file
+    class ConfigVersionUpdate
+      include PicsolveDockerBuilder::Base
+
+      def self.update_task
+        log = Logger.new(STDOUT)
+
+        if ENV['service_name'].nil? || ENV['service_tag'].nil?
+          log.info 'No update needed as environment variables service_name '\
+            'and service_tag are not in place'
+
+          return
+        end
+
+        cvu = new
+        cvu.update_commit_push(
+          ENV['service_name'],
+          ENV['service_tag'],
+          ENV['service_commit'],
+          ENV['service_url']
+        )
+      end
+
+      def initialize(path = nil)
+        @path = path || config_file
+      end
+
+      def check_for_uncommitted
+        return unless git.status.changed.keys.include? config_path
+
+        log.error "Uncommited changes to '#{config_path}'. Can't continue ..."
+        exit(1)
+      end
+
+      def commit_and_push(
+        container_name,
+        tag,
+        git_commit,
+        git_url
+      )
+        git.add config_path
+        message = "Upgrades version of '#{container_name}'"\
+          " to tag '#{tag}'"
+
+        message += "\n  git_commit=#{git_commit}" if git_commit
+        message += "\n  git_url=#{git_url}" if git_url
+        git.commit message
+        git.push(git_remote, git_branch)
+      rescue Git::GitExecuteError => exception
+        log.warn "Problem during commiting: #{exception}"
+      end
+
+      def git_remote_branch
+        ENV['GIT_BRANCH'] || 'origin/develop'
+      end
+
+      def git_remote
+        git_remote_branch.split('/')[0]
+      end
+
+      def git_branch
+        git_remote_branch.split('/')[1]
+      end
+
+      def config_file
+        unless File.file?(config_path)
+          File.open(config_path, 'w') do |file|
+            file.write('')
+          end
+        end
+        File.new config_path
+      end
+
+      def config_path
+        '.docker-builder.version.yml'
+      end
+
+      def git
+        @git ||= Git.open('.')
+      end
+
+      def update_commit_push(*args)
+        check_for_uncommitted
+        update(*args)
+        commit_and_push(*args)
+      end
+
+      def update(
+        container_name,
+        tag,
+        git_commit,
+        git_url
+      )
+        read
+        config = {
+          'compose' => {
+            'containers' => {
+              container_name => {
+                'tag' => tag
+              }
+            }
+          }
+        }
+        c = config['compose']['containers'][container_name]
+
+        c['git_commit'] = git_commit unless git_commit.nil?
+        c['git_url'] = git_url unless git_url.nil?
+
+        @config = @config.deep_merge(config)
+        write
+      end
+
+      def write
+        File.open(@path, 'w') do |file|
+          file.write(Psych.dump(config))
+        end
+      end
+
+      def default
+        {}
+      end
+
+      def config
+        return @config unless @config.nil?
+        read
+      end
+
+      def read
+        @config = default
+        begin
+          yaml = Psych.load_file @path
+          @config = @config.deep_merge(yaml) if yaml
+        rescue Errno::ENOENT
+          raise "cannot find config at '#{path}'"
+        end
+      end
+    end
+  end
+end

data/lib/picsolve_docker_builder/helpers/kubernetes/rc.rb

@@ -43,7 +43,7 @@ module PicsolveDockerBuilder
         def containers
           c = {
             'name'  => @image.name,
-            'image' => @image.repo_tag_unique,
+            'image' => @image.image_name_tag,
             'ports' => @image.ports_rc
           }
           # append environment variables if in place

data/lib/picsolve_docker_builder/helpers/registry.rb

@@ -2,6 +2,7 @@ require 'picsolve_docker_builder/base'
 require 'excon'
 require 'json'
 require 'base64'
+require 'picsolve_docker_builder/helpers/repository'
 
 module PicsolveDockerBuilder
   module Helpers
@@ -12,6 +13,15 @@ module PicsolveDockerBuilder
 
       attr_reader :config
 
+      def self.creds(image = nil)
+        if image.nil?
+          registry = 'https://docker.picsolve.net'
+        else
+          registry = "https://#{image.split('/')[0]}"
+        end
+        new(registry).creds
+      end
+
       def initialize(registry)
         @registry = registry
       end
@@ -34,17 +44,19 @@ module PicsolveDockerBuilder
       end
 
       def list_tags_v1(image)
-        endpoint = "/v1/repositories/#{image}/tags"
+        base_url = "/v1/repositories/#{image.user}/#{image.repo}"
+        endpoint = "#{base_url}/tags"
         r = connection.get(path: endpoint)
         JSON.parse(r.body)
       end
 
       def list_tags_v2(image)
-        endpoint = "/v2/#{image}/tags/list"
+        base_url = "/v2/#{image.user}/#{image.repo}"
+        endpoint = "#{base_url}/tags/list"
         r = connection.get(path: endpoint)
         o = {}
         JSON.parse(r.body)['tags'].each do |tag|
-          endpoint = "/v2/#{image}/manifests/#{tag}"
+          endpoint = "#{base_url}/manifests/#{tag}"
           r = connection.get(path: endpoint)
           digest = Digest::SHA2.new(256)
           JSON.parse(r.body)['fsLayers'].each do |fs_hash|
@@ -70,6 +82,7 @@ module PicsolveDockerBuilder
       end
 
       def list_tags(image)
+        image = Repository.new image
         if api_version == :v1
           list_tags_v1(image)
         elsif api_version == :v2
@@ -85,7 +98,8 @@ module PicsolveDockerBuilder
 
       def headers
         {
-          'Host' => http_host
+          'Host' => http_host,
+          'Authorization' => "Basic #{login_basic}"
         }
       end
 
@@ -96,11 +110,11 @@ module PicsolveDockerBuilder
         )
       end
 
-      def self.dockercfg_path
+      def dockercfg_path
         File.expand_path '~/.dockercfg'
       end
 
-      def self.dockercfg
+      def dockercfg
         JSON.parse(
           File.open(
             dockercfg_path
@@ -108,58 +122,19 @@ module PicsolveDockerBuilder
         )
       end
 
-      def self.creds(*args)
-        auth = Base64.decode64(
-          get_login_basic(
-            *args
-          )
-        ).split(':')
+      def creds
+        auth = Base64.decode64(login_basic).split(':')
         {
           'username' => auth[0],
           'password' => auth[1]
         }
       end
 
-      def self.get_login_basic(registry = 'docker.picsolve.net')
-        dockercfg[registry]['auth']
+      def login_basic
+        dockercfg[http_host]['auth']
       rescue StandardError
         nil
       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 = {}
-        login_basic = get_login_basic
-        headers['Authorization'] = "Basic #{login_basic}" \
-          unless login_basic.nil?
-
-        connection = Excon.new(
-          'https://docker.picsolve.net',
-          headers: headers,
-          persistent: true
-        )
-        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

data/lib/picsolve_docker_builder/version.rb

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

data/lib/tasks/compose.rake

@@ -24,4 +24,10 @@ namespace :compose do
     @docker_compose.stage = stage
     @docker_compose.deploy
   end
+
+  desc 'Update version of container'
+  task :update do
+    require 'picsolve_docker_builder/helpers/config_version_update'
+    PicsolveDockerBuilder::Helpers::ConfigVersionUpdate.update_task
+  end
 end

data/picsolve_docker_builder.gemspec

@@ -34,4 +34,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'docker-api'
   spec.add_dependency 'net-ssh'
   spec.add_dependency 'pg'
+  spec.add_dependency 'git'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picsolve_docker_builder
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Christian Simon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -192,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: git
+  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'
 description: 
 email:
 - christian.simon@picsolve.com
@@ -268,6 +282,7 @@ files:
 - lib/picsolve_docker_builder/helpers/config/secret.rb
 - lib/picsolve_docker_builder/helpers/config/variable_object.rb
 - lib/picsolve_docker_builder/helpers/config_manager.rb
+- lib/picsolve_docker_builder/helpers/config_version_update.rb
 - lib/picsolve_docker_builder/helpers/kubeclient.rb
 - lib/picsolve_docker_builder/helpers/kubernetes/pod.rb
 - lib/picsolve_docker_builder/helpers/kubernetes/rc.rb