picsolve_docker_builder 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d987f527c105ef90502bd0201ecb24ada6573e4
-  data.tar.gz: 6cacbe31a88fae3264b790e014f7c2ab40528e50
+  metadata.gz: 8b29a00fbb04c5a8b3269567ad9a640d5f07bda1
+  data.tar.gz: b65052cb5bee9b9e80298d18c264412789704bc4
 SHA512:
-  metadata.gz: 95452c0a4140df6b0e8e4d4af1f12e2ea533affad313e437c8e2768d4841d007f05ffaf20210512ba3b9f7906c4359530052d159ca36e6f3c1feba8f4a0325ec
-  data.tar.gz: 3ff8233cf0152f8078d398b6665caebecc5fb1029abd358f822dfe38d456c925112b559234c30982bc7d1fa3e66d443a4bed66b2d236d3480cad620b23ababd6
+  metadata.gz: 83473b874548ae15dcb027c705f7198565d87b750251a10eb709a12bd4e3fe5f5a3a8f84e0f2c6e42945b4fe541ea52a838daf3301c2ff54778695f542c3b807
+  data.tar.gz: 8aa15a239796fcedf0e8b9ca3e67a6b68d581a4a905b47d91a4a2873375572edd9f76fa60836db0046e4828f1941b24e58e9430f63e70747860a2d1415b307d1

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## [0.3.1] - 2015-12-09
+### Added
+- Support deployment of healthchecks
+
 ## [0.3.0] - 2015-11-13
 ### Added
 

data/Guardfile

@@ -0,0 +1,16 @@
+guard :rspec, cmd: 'bundle exec rspec' do
+  require 'guard/rspec/dsl'
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  # Feel free to open issues for suggestions and improvements
+
+  # RSpec files
+  rspec = dsl.rspec
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files)
+
+  # Ruby files
+  ruby = dsl.ruby
+  dsl.watch_spec_files_for(ruby.lib_files)
+end

data/lib/picsolve_docker_builder/composer/composer.rb

@@ -1,7 +1,7 @@
 require 'picsolve_docker_builder/base'
 require 'picsolve_docker_builder/helpers/kubernetes_manager'
 require 'picsolve_docker_builder/helpers/config_manager'
-require 'picsolve_docker_builder/composer/image'
+require 'picsolve_docker_builder/composer/container'
 require 'excon'
 require 'psych'
 require 'securerandom'
@@ -79,7 +79,7 @@ module PicsolveDockerBuilder
         unless containers.nil?
           i = []
           containers.each do |name, config|
-            i << Image.new(name, config, self)
+            i << Container.new(name, config, self)
           end
           return i
         end

data/lib/picsolve_docker_builder/composer/container.rb

@@ -13,7 +13,6 @@ module PicsolveDockerBuilder
         @config = config
         @name = name
         @composer = composer
-        log.info "repo_tag_uniqe is #{repo_tag_unique}"
       end
 
       def repo_tag
@@ -70,8 +69,14 @@ module PicsolveDockerBuilder
 
       def ports
         config['ports'].map do |port|
+          if port.is_a? String
+            port_split = port.split(/:/)
+            container_port = port_split[1]
+          else
+            container_port = port['container_port']
+          end
           {
-            'port' => port['container_port'].to_i
+            'port' => container_port.to_i
           }
         end
       rescue StandardError
@@ -88,6 +93,28 @@ module PicsolveDockerBuilder
         p
       end
 
+      def liveness_probe
+        # get port with health check
+        port = nil
+        config['ports'].each do |p|
+          next unless p['health_check'] == 'http'
+          port = p
+          break
+        end
+
+        # no health check
+        return nil if port.nil?
+
+        {
+          'httpGet' => {
+            'path' => '/healthcheck',
+            'port' => port['container_port']
+          },
+          'initialDelaySeconds' => 20,
+          'timeoutSeconds' => 1
+        }
+      end
+
       def repo_tag_hash_unique
         @repo_tag_hash_unique ||= Registry.repo_tag_unique(config['image'])
       end

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

@@ -51,6 +51,11 @@ module PicsolveDockerBuilder
             env = @image.environment(@kubernetes)
             c['env'] = env unless env.nil?
           end
+
+          # append liveness probe if required
+          liveness_probe = @image.liveness_probe
+          c['livenessProbe'] = liveness_probe unless liveness_probe.nil?
+
           [c]
         end
 

data/lib/picsolve_docker_builder/version.rb

@@ -1,4 +1,4 @@
 # version
 module PicsolveDockerBuilder
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/picsolve_docker_builder.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop-checkstyle_formatter'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'simplecov-cobertura'
+  spec.add_development_dependency 'guard-rspec'
   spec.add_dependency 'rake', '~> 10.0'
   spec.add_dependency 'kubeclient', '~> 0.5.1'
   spec.add_dependency 'docker-api'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picsolve_docker_builder
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Christian Simon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +206,7 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Guardfile
 - README.md
 - Rakefile
 - bin/docker_build
@@ -244,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/image.rb
 - lib/picsolve_docker_builder/composer/registry.rb
 - lib/picsolve_docker_builder/composer/requirements.rb
 - lib/picsolve_docker_builder/composer/requirements/base.rb

data/lib/picsolve_docker_builder/composer/image.rb

@@ -1,70 +0,0 @@
-require 'picsolve_docker_builder/base'
-require 'picsolve_docker_builder/composer/registry'
-
-module PicsolveDockerBuilder
-  module Composer
-    # Represents an image in the registry
-    class Image
-      include PicsolveDockerBuilder::Base
-      attr_reader :config, :name, :composer
-      def initialize(name, config, composer)
-        log.info "Image name=#{name} config=#{config}"
-        @config = config
-        @name = name
-        @composer = composer
-        log.info "repo_tag_uniqe is #{repo_tag_unique}"
-      end
-
-      def repo_tag
-        config['image']
-      end
-
-      def rc(kubernetes)
-        @rcs = {} if @rcs.nil?
-        @rcs[kubernetes] = kubernetes.rc(self) \
-          unless @rcs.key?(kubernetes)
-        @rcs[kubernetes]
-      end
-
-      def service(kubernetes)
-        @services = {} if @rcs.nil?
-        @services[kubernetes] = kubernetes.service(self) \
-          unless @services.key?(kubernetes)
-        @services[kubernetes]
-      end
-
-      def ports
-        config['ports'].map do |port|
-          port_split = port.split(/:/)
-          {
-            'port' => port_split[1].to_i
-          }
-        end
-      rescue StandardError
-        []
-      end
-
-      def ports_rc
-        p = []
-        ports.each do |port|
-          p << {
-            'containerPort' => port['port']
-          }
-        end
-        p
-      end
-
-      def repo_tag_hash_unique
-        @repo_tag_hash_unique ||= Registry.repo_tag_unique(config['image'])
-      end
-
-      def repo_tag_unique
-        repo_tag_hash_unique[:tag_unique]
-      end
-
-      def hash
-        repo_tag_hash_unique[:hash]
-      end
-    end
-  end
-end