picsolve_docker_builder 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47c0bcbcd965d2446b0c1c9254a67bbd23a9569d
-  data.tar.gz: 1a4f008a15c22534b990a77bca137fb4b04c0464
+  metadata.gz: 0d987f527c105ef90502bd0201ecb24ada6573e4
+  data.tar.gz: 6cacbe31a88fae3264b790e014f7c2ab40528e50
 SHA512:
-  metadata.gz: 34289ce6a0dfea6cb6ac0b4bf23f76bad8a7300b91e3c75dbb5d63ece96f17d61e5dd9dd08d0997cf668948e98d5bf4728065c9915f8714c6ac0fe1dae473836
-  data.tar.gz: d042eaacd90ded220dd645d5763dccc4cc0ff37e5bdd1c25f742ead7f1ed2483ab44f0d33cc6eff9ecd6d5573834979cd76554054e61452b656ca8819bf3be13
+  metadata.gz: 95452c0a4140df6b0e8e4d4af1f12e2ea533affad313e437c8e2768d4841d007f05ffaf20210512ba3b9f7906c4359530052d159ca36e6f3c1feba8f4a0325ec
+  data.tar.gz: 3ff8233cf0152f8078d398b6665caebecc5fb1029abd358f822dfe38d456c925112b559234c30982bc7d1fa3e66d443a4bed66b2d236d3480cad620b23ababd6

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [0.3.0] - 2015-11-13
+### Added
+
+- Support creation of postgres databases if needed
+- Support build without publishing docker image
+- Pass environment to docker container
+
 ## [0.2.0] - 2015-08-26
 ### Added
 - Upgrade kubernetes api to v1

data/Rakefile

@@ -60,6 +60,7 @@ task test_integration: [:test, :integration]
 
 desc 'Run all tests for jenkins'
 task :jenkins_prepare do
+  ENV['JENKINS'] = '1'
   # cleanup target
   FileUtils.rm_rf 'target'
   FileUtils.mkdir 'target'

data/integration/compose_hello_world_new_config/.docker-builder.yml

@@ -1,7 +1,7 @@
 compose:
   app_name: hello_world_test_new
   clusters:
-  - dev-1b.kubernetes.picsolve.net
+  - prod-1a.kubernetes.picsolve.net
   containers:
     helloworld:
       image: docker.picsolve.net/hello-world

data/integration/compose_hello_world_old_config/.docker-builder.yml

@@ -1,4 +1,4 @@
 compose:
   app_name: hello_world_test
   clusters:
-  - dev-1b.kubernetes.picsolve.net
+  - prod-1a.kubernetes.picsolve.net

data/lib/picsolve_docker_builder/base.rb

@@ -39,8 +39,12 @@ module PicsolveDockerBuilder
       Dir.pwd
     end
 
+    def config_file
+      ENV['DOCKER_BUILDER_FILE'] || '.docker-builder.yml'
+    end
+
     def config_path
-      File.join(base_dir, '.docker-builder.yml')
+      File.join(base_dir, config_file)
     end
 
     def default_config

data/lib/picsolve_docker_builder/composer/container.rb

@@ -1,5 +1,6 @@
 require 'picsolve_docker_builder/base'
 require 'picsolve_docker_builder/composer/registry'
+require 'picsolve_docker_builder/composer/requirements'
 
 module PicsolveDockerBuilder
   module Composer
@@ -33,8 +34,32 @@ module PicsolveDockerBuilder
         @services[kubernetes]
       end
 
-      def environment
-        return nil unless config.key? 'environment'
+      def requirements(kubernetes)
+        return [] unless config.key? 'requirements'
+        config['requirements'].map do |name, config|
+          PicsolveDockerBuilder::Composer::Requirements.new(
+            name,
+            config,
+            PicsolveDockerBuilder::Composer::Requirements::Context.new(
+              kubernetes,
+              self
+            )
+          )
+        end
+      end
+
+      def environment(kubernetes)
+        env = []
+        log.info "evaluate dynamic stage variables #{kubernetes.stage}"
+        requirements(kubernetes).each do |req|
+          env += req.environment
+        end
+        env += environment_static
+        env
+      end
+
+      def environment_static
+        return [] unless config.key? 'environment'
         config['environment'].map do |key, value|
           {
             'name' => key,

data/lib/picsolve_docker_builder/composer/registry.rb

@@ -42,6 +42,11 @@ module PicsolveDockerBuilder
         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(/:/)
@@ -49,7 +54,6 @@ module PicsolveDockerBuilder
         tag = repo_tag_split[1] || 'latest'
 
         headers = {}
-        login_basic = get_login_basic
         headers['Authorization'] = "Basic #{login_basic}" \
           unless login_basic.nil?
 

data/lib/picsolve_docker_builder/composer/requirements/base.rb

@@ -0,0 +1,64 @@
+require 'picsolve_docker_builder/base'
+require 'securerandom'
+module PicsolveDockerBuilder
+  module Composer
+    module Requirements
+      # Base class for requirements
+      class Base
+        include PicsolveDockerBuilder::Base
+        attr_reader :name, :config
+        def initialize(name, config, context)
+          @name = name
+          @config = config
+          @context = context
+        end
+
+        def environment(_kubernetes)
+          []
+        end
+
+        def stage
+          @context.kubernetes.stage
+        end
+
+        def kubernetes
+          @context.kubernetes
+        end
+
+        def namespace
+          @context.namespace
+        end
+
+        def container
+          @context.container
+        end
+
+        def gen_password(length = 16)
+          SecureRandom.urlsafe_base64(length)
+        end
+
+        def create_secret(name, obj)
+          secret = Kubeclient::Secret.new
+          secret.metadata = {
+            name: name,
+            namespace: namespace
+          }
+          secret.data = {}
+          obj.each do |key, value|
+            secret.data[key.to_sym] = Base64.encode64(value).delete("\n")
+          end
+          kubernetes.client.create_secret secret
+        end
+
+        def get_secret(name)
+          obj = kubernetes.client.get_secret(name, namespace)
+          hash = {}
+          obj.data.to_hash.each do |key, value|
+            hash[key.to_s] = Base64.decode64(value)
+          end
+          hash
+        end
+      end
+    end
+  end
+end

data/lib/picsolve_docker_builder/composer/requirements/context.rb

@@ -0,0 +1,21 @@
+require 'picsolve_docker_builder/base'
+
+module PicsolveDockerBuilder
+  module Composer
+    module Requirements
+      # Base class for requirements
+      class Context
+        include PicsolveDockerBuilder::Base
+        attr_reader :kubernetes, :container
+        def initialize(kubernetes, container)
+          @kubernetes = kubernetes
+          @container = container
+        end
+
+        def namespace
+          @container.composer.namespace
+        end
+      end
+    end
+  end
+end

data/lib/picsolve_docker_builder/composer/requirements/postgres.rb

@@ -0,0 +1,139 @@
+require 'base64'
+require 'kubeclient'
+require 'picsolve_docker_builder/composer/requirements/base'
+require 'picsolve_docker_builder/helpers/ssh_connection'
+require 'pg'
+
+module PicsolveDockerBuilder
+  module Composer
+    module Requirements
+      # Postgres db requirements
+      class Postgres < Base
+        def ssh_forward(host, port)
+          @ssh = PicsolveDockerBuilder::Helpers::SshConnection.new(
+            ssh_host: kubernetes.host,
+            ssh_port: kubernetes.port
+          )
+          forward = @ssh.forward(host, port)
+          @ssh.start
+          forward
+        end
+
+        # get postgres secret for current container
+        def postgres_secret
+          get_secret(user_and_db_name)
+        rescue KubeException => e
+          raise e unless e.message.match(/not found/)
+          log.info "Secret for #{user_and_db_name} database not found"
+          create_postgres_secret
+        end
+
+        # create a new postgres secret and create the according database
+        def create_postgres_secret
+          admin_secret = admin_postgres_secret
+
+          log.info "Create secret for #{user_and_db_name} database"
+          container_secret = {
+            'name' => user_and_db_name,
+            'user' => user_and_db_name,
+            'password' => gen_password,
+            'host' => admin_secret['host'],
+            'port' => admin_secret['port']
+          }
+          create_postgres_database(
+            admin_secret,
+            container_secret
+          )
+          create_secret(
+            user_and_db_name,
+            container_secret
+          )
+          container_secret
+        end
+
+        # create postgres database
+        # rubocop:disable Metrics/MethodLength
+        def create_postgres_database(admin_secret, container_secret)
+          log.info "Create database #{user_and_db_name}"
+
+          forward = ssh_forward(admin_secret['host'], admin_secret['port'].to_i)
+          admin_secret['host'] = '127.0.0.1'
+          admin_secret['port'] = forward.local_port
+
+          conn = PG::Connection.open(admin_secret)
+
+          user = conn.escape_string(container_secret['user'])
+          password = conn.escape_string(container_secret['password'])
+          name = conn.escape_string(container_secret['name'])
+
+          # create user
+          conn.exec(
+            "CREATE USER \"#{user}\" " \
+            "WITH PASSWORD '#{password}'"
+          )
+
+          # create db
+          conn.exec(
+            "CREATE DATABASE \"#{name}\""
+          )
+
+          # grant all rights to the user and the aws user
+          conn.exec("
+            GRANT ALL PRIVILEGES ON DATABASE \"#{name}\" to \"#{user}\";
+            GRANT ALL PRIVILEGES ON DATABASE \"#{name}\" to \"rds_superuser\";
+          ")
+
+          conn.close
+
+          admin_secret['dbname'] = name
+          admin_secret['user'] = user
+          admin_secret['password'] = password
+          conn = PG::Connection.open(admin_secret)
+
+          conn.exec("
+            ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL PRIVILEGES
+            ON TABLES TO \"#{user}\";
+            ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL PRIVILEGES
+            ON TABLES TO \"rds_superuser\";
+            ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL PRIVILEGES
+            ON SEQUENCES TO \"#{user}\";
+            ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL PRIVILEGES
+            ON SEQUENCES TO \"rds_superuser\";
+            ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL PRIVILEGES
+            ON FUNCTIONS TO \"#{user}\";
+            ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL PRIVILEGES
+            ON FUNCTIONS TO \"rds_superuser\";
+          ")
+          conn.close
+        end
+        # rubocop:enable Metrics/MethodLength
+
+        # get administrative postgres secrets
+        def admin_postgres_secret
+          get_secret('postgres').update('dbname' => 'postgres')
+        end
+
+        def user_and_db_name
+          "#{stage}-#{container.name}-#{name}"
+        end
+
+        def postgres_secret_name
+          "postgres-#{user_and_db_name}"
+        end
+
+        def environment_secret
+          postgres_secret.map do |key, value|
+            {
+              'name'  => "#{name.upcase}_#{key.upcase}",
+              'value' => value
+            }
+          end
+        end
+
+        def environment
+          environment_secret
+        end
+      end
+    end
+  end
+end

data/lib/picsolve_docker_builder/composer/requirements.rb

@@ -0,0 +1,22 @@
+require 'picsolve_docker_builder/composer/requirements/context'
+require 'picsolve_docker_builder/composer/requirements/postgres'
+module PicsolveDockerBuilder
+  module Composer
+    # Requirements are enviromental dependencies for containers
+    module Requirements
+      def self.new(name, config, context)
+        fail 'Requirement need to have parameter type' \
+          unless config.key? 'type'
+        object(config['type']).new(name, config, context)
+      end
+
+      def self.object(type)
+        if type == 'postgres'
+          Postgres
+        else
+          fail "Unknown requirement '#{type}'"
+        end
+      end
+    end
+  end
+end

data/lib/picsolve_docker_builder/frame.rb

@@ -6,6 +6,7 @@ require 'psych'
 
 module PicsolveDockerBuilder
   # Docker image building template
+  # rubocop:disable Metrics/ClassLength
   class Frame
     include PicsolveDockerBuilder::Base
 
@@ -138,7 +139,15 @@ module PicsolveDockerBuilder
       @docker_build = docker_build_build
     end
 
+    def asset_build
+    end
+
     def build
+      asset_build
+      if dest_image_name.nil?
+        log.info 'Skip building docker image as no dest_image is set'
+        return
+      end
       docker_build
     end
 
@@ -229,13 +238,33 @@ module PicsolveDockerBuilder
       @container ||= create_container
     end
 
+    def environment
+      blacklist = %w(
+        SSH_CLIENT
+        SSH_CONNECTION
+        LD_LIBRARY_PATH
+        PATH
+        NVM_DIR
+        NVM_NODEJS_ORG_MIRROR)
+
+      keys = ENV.keys
+      keys = keys.reject do |key|
+        blacklist.include? key
+      end
+
+      keys.map do |key|
+        "#{key}=#{ENV[key]}"
+      end
+    end
+
     def create_container
       command = ['/bin/sleep', '3600']
       c = Docker::Container.create(
-        'Image'     => asset_image.id,
-        'Cmd'       => command,
-        'OpenStdin' => false,
-        'WorkingDir' => '/_build'
+        'Image'      => asset_image.id,
+        'Cmd'        => command,
+        'OpenStdin'  => false,
+        'WorkingDir' => '/_build',
+        'Env'        => environment
       )
       at_exit do
         stop

data/lib/picsolve_docker_builder/helpers/config/base.rb

@@ -6,6 +6,7 @@ module PicsolveDockerBuilder
         def self.name
           nil
         end
+
         def initialize(_identifier)
         end
       end

data/lib/picsolve_docker_builder/helpers/config/secret.rb

@@ -6,6 +6,7 @@ module PicsolveDockerBuilder
         def self.name
           'secret'
         end
+
         def initialize(_identifier)
         end
       end

data/lib/picsolve_docker_builder/helpers/config/variable_object.rb

@@ -7,9 +7,11 @@ module PicsolveDockerBuilder
         def self.regex_full
           /^\$\{([^\}]*)\}$/
         end
+
         def self.regex
           /\$\{[^\}]*\}/
         end
+
         # Checks if a string needs to be replaced by an VariableObject
         def self.replace_string(obj)
           return obj unless VariableObject.regex.match(obj)

data/lib/picsolve_docker_builder/helpers/config_manager.rb

@@ -28,7 +28,9 @@ module PicsolveDockerBuilder
       end
 
       def eval_container_config(config)
-        config['environment'] = eval_container_env(config['environment'])
+        # eval environment if key exits
+        config['environment'] = eval_container_env(config['environment']) \
+          if config.key? 'environment'
         config
       end
 

data/lib/picsolve_docker_builder/helpers/kubeclient.rb

@@ -1,34 +1 @@
 require 'kubeclient'
-
-module Kubeclient
-  module Common
-    # Hot fix for kubeclient should be going upstream
-    # * https://github.com/abonas/kubeclient/pull/96
-    class Client
-      def get_entities(entity_type, klass, options)
-        params = {}
-        if options[:label_selector]
-          params['params'] = { labelSelector: options[:label_selector] }
-        end
-
-        ns_prefix = build_namespace_prefix(options[:namespace])
-        response = handle_exception do
-          rest_client[ns_prefix + resource_name(entity_type)]
-          .get(params.merge(@headers))
-        end
-
-        result = JSON.parse(response)
-
-        resource_version = result.fetch('resourceVersion', nil)
-        if resource_version.nil?
-          resource_version =
-            result.fetch('metadata', {}).fetch('resourceVersion', nil)
-        end
-
-        collection = result['items'].map { |item| new_entity(item, klass) }
-
-        EntityList.new(entity_type, resource_version, collection)
-      end
-    end
-  end
-end

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

@@ -12,10 +12,9 @@ module PicsolveDockerBuilder
         end
 
         def existing_rcs
-          rcs = client.get_replication_controllers(
-            namespace: @image.composer.namespace
-          ).select do |rc|
-            rc.metadata.name.match(/^#{@image.name}/)
+          rcs = client.get_replication_controllers.select do |rc|
+            rc.metadata.name.match(/^#{@image.name}/) && \
+            rc.metadata.namespace == @image.composer.namespace
           end
           rcs.map do |rc|
             Rc.new(@image, @kubernetes, rc)
@@ -49,7 +48,7 @@ module PicsolveDockerBuilder
           }
           # append environment variables if in place
           if @image.class.instance_methods.include? :environment
-            env = @image.environment
+            env = @image.environment(@kubernetes)
             c['env'] = env unless env.nil?
           end
           [c]
@@ -76,10 +75,14 @@ module PicsolveDockerBuilder
         end
 
         def pods_by_selector(selector)
-          client.get_pods(
+          pods = client.get_pods(
             namespace: @rc.metadata.namespace,
             label_selector: selector
-          ).map do |pod|
+          ).select do |pod|
+            pod.metadata.namespace == @rc.metadata.namespace
+          end
+
+          pods.map do |pod|
             Pod.new(pod, @kubernetes)
           end
         end

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

@@ -0,0 +1,11 @@
+require 'picsolve_docker_builder/helpers/kubernetes/resource'
+
+module PicsolveDockerBuilder
+  module Helpers
+    module Kubernetes
+      # A kubernetes secret
+      class Secret < Resource
+      end
+    end
+  end
+end

data/lib/picsolve_docker_builder/helpers/kubernetes_manager.rb

@@ -2,7 +2,7 @@ require 'picsolve_docker_builder/helpers/kubeclient'
 require 'picsolve_docker_builder/helpers/kubernetes/rc'
 require 'picsolve_docker_builder/helpers/kubernetes/service'
 require 'picsolve_docker_builder/helpers/kubernetes/pod'
-require 'picsolve_docker_builder/helpers/ssh_forward'
+require 'picsolve_docker_builder/helpers/ssh_connection'
 require 'picsolve_docker_builder/base'
 
 module PicsolveDockerBuilder
@@ -31,6 +31,10 @@ module PicsolveDockerBuilder
         @composer = composer
       end
 
+      def user
+        'core'
+      end
+
       def create_client
         Kubeclient::Client.new kubernetes_url, 'v1'
       end
@@ -48,8 +52,8 @@ module PicsolveDockerBuilder
       end
 
       def kubernetes_url_ssh_forward_stop
-        @ssh_forward.stop unless @ssh_forward.nil?
-        @ssh_forward = nil
+        @ssh.stop unless @ssh_forward.nil?
+        @ssh = nil
       end
 
       def stop
@@ -57,18 +61,16 @@ module PicsolveDockerBuilder
       end
 
       def kubernetes_url_ssh_forward
-        @ssh_forward = SshForward.new(
+        @ssh = SshConnection.new(
           ssh_host: host,
-          ssh_port: port,
-          local_port: 10_000,
-          remote_host: '127.0.0.1',
-          remote_port: 8080
+          ssh_port: port
         )
-        port = @ssh_forward.start
+        forward = @ssh.forward('127.0.0.1', 8080, 10_000)
+        @ssh.start
         at_exit do
           kubernetes_url_ssh_forward_stop
         end
-        "http://127.0.0.1:#{port}"
+        "http://127.0.0.1:#{forward.local_port}"
       end
 
       def client

data/lib/picsolve_docker_builder/helpers/registry.rb

@@ -0,0 +1,165 @@
+require 'picsolve_docker_builder/base'
+require 'excon'
+require 'json'
+require 'base64'
+
+module PicsolveDockerBuilder
+  module Helpers
+    # This represents a remote registry, that is queried for
+    # for informations about images
+    class Registry
+      include PicsolveDockerBuilder::Base
+
+      attr_reader :config
+
+      def initialize(registry)
+        @registry = registry
+      end
+
+      def api_version_unsupported
+        fail 'No supported version found at registry'
+      end
+
+      def api_version
+        return @api_version unless @api_version.nil?
+        if connection.get(path: '/v2/').status == 200
+          @api_version = :v2
+        elsif connection.get(path: '/v1/_ping').status == 200
+          @api_version = :v1
+        else
+          api_version_unsupported
+        end
+        log.info "Detected api version #{@api_version} on registry #{@registry}"
+        @api_version
+      end
+
+      def list_tags_v1(image)
+        endpoint = "/v1/repositories/#{image}/tags"
+        r = connection.get(path: endpoint)
+        JSON.parse(r.body)
+      end
+
+      def list_tags_v2(image)
+        endpoint = "/v2/#{image}/tags/list"
+        r = connection.get(path: endpoint)
+        o = {}
+        JSON.parse(r.body)['tags'].each do |tag|
+          endpoint = "/v2/#{image}/manifests/#{tag}"
+          r = connection.get(path: endpoint)
+          digest = Digest::SHA2.new(256)
+          JSON.parse(r.body)['fsLayers'].each do |fs_hash|
+            digest.update(fs_hash['blobSum'])
+          end
+          o[tag] = digest.to_s
+        end
+        o
+      end
+
+      def unique_tag(image, tag)
+        tags = list_tags(image)
+        fail "tag '#{tag}' not found" unless tags.include? tag
+        tags.each do |my_tag, hash|
+          # next if not right name
+          next unless my_tag.match(/^jenkins-/)
+          # next hash not matching
+          next if hash != tags[tag]
+          # return tag name now
+          return my_tag
+        end
+        fail "no unique tag found for tag=#{tag}"
+      end
+
+      def list_tags(image)
+        if api_version == :v1
+          list_tags_v1(image)
+        elsif api_version == :v2
+          list_tags_v2(image)
+        else
+          api_version_unsupported
+        end
+      end
+
+      def http_host
+        URI(@registry).host
+      end
+
+      def headers
+        {
+          'Host' => http_host
+        }
+      end
+
+      def connection
+        @connection ||= Excon.new(
+          @registry,
+          headers: headers
+        )
+      end
+
+      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.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/helpers/repository.rb

@@ -19,7 +19,7 @@ module PicsolveDockerBuilder
           split_length_1(split)
         elsif split.length == 2
           split_length_2(split)
-        elsif  split.length == 3
+        elsif split.length == 3
           split_length_3(split)
         end
       end

data/lib/picsolve_docker_builder/helpers/ssh_connection.rb

@@ -0,0 +1,68 @@
+require 'picsolve_docker_builder/helpers/ssh_forward'
+require 'picsolve_docker_builder/base'
+require 'net/ssh'
+
+module PicsolveDockerBuilder
+  module Helpers
+    # Ruby class that can forward a remote port over SSH
+    class SshConnection
+      include PicsolveDockerBuilder::Base
+      attr_reader :options
+      def initialize(opts)
+        @options = opts
+      end
+
+      def connection
+        @connection ||= Net::SSH.start(
+          ssh_host,
+          ssh_user,
+          port: ssh_port
+        )
+      end
+
+      def forward(*args)
+        SshForward.forward(connection, *args)
+      end
+
+      def start
+        log.debug "Connecting via ssh to host '#{ssh_user}@#{ssh_host}'"
+        # start thread with ssh
+        @thread = Thread.new do
+          connection.loop { true }
+        end
+      end
+
+      def stop
+        return if @thread.nil?
+        @thread.kill
+        @thread.join
+        log.debug \
+          "Disconnected ssh connection to host '#{ssh_user}@#{ssh_host}'"
+      end
+
+      def ssh_user
+        options[:ssh_user] = 'core'
+      end
+
+      def ssh_host
+        options[:ssh_host]
+      end
+
+      def ssh_port
+        options[:ssh_port] || 22
+      end
+
+      def remote_host
+        options[:remote_host]
+      end
+
+      def remote_port
+        options[:remote_port]
+      end
+
+      def local_port
+        options[:local_port] || remote_port
+      end
+    end
+  end
+end

data/lib/picsolve_docker_builder/helpers/ssh_forward.rb

@@ -5,79 +5,36 @@ module PicsolveDockerBuilder
   module Helpers
     # Ruby class that can forward a remote port over SSH
     class SshForward
-      include PicsolveDockerBuilder::Base
-      attr_reader :options
-      def initialize(opts)
-        @options = opts
+      def self.forward(*args)
+        f = new(*args)
+        f.bind_port
+        f
       end
 
-      def connection
-        @connection ||= Net::SSH.start(
-          ssh_host,
-          ssh_user,
-          port: ssh_port
-        )
+      include PicsolveDockerBuilder::Base
+      attr_reader :connection, :local_port
+      def initialize(connection, remote_host, remote_port, local_port = nil)
+        @connection = connection
+        @remote_host = remote_host
+        @remote_port = remote_port
+        @local_port = local_port || remote_port
       end
 
       def bind_port
         tries = 0
-        port = local_port
         begin
-          connection.forward.local(port, remote_host, remote_port)
-          return port
+          connection.forward.local(@local_port, @remote_host, @remote_port)
+          log.info "forward remote port #{@remote_host}:#{@remote_port}" \
+            " to local port #{@local_port}"
+          return @local_port
         rescue Errno::EADDRINUSE => e
           # raise after five failed tries
           raise e if tries > 5
           tries += 1
-          port += 1
+          @local_port += 1
           retry
         end
       end
-
-      def start
-        log.debug "Connecting via ssh to host '#{ssh_user}@#{ssh_host}'"
-
-        # bind remote service to local port
-        port = bind_port
-
-        # start thread with ssh
-        @thread = Thread.new do
-          connection.loop { true }
-        end
-        port
-      end
-
-      def stop
-        return if @thread.nil?
-        @thread.kill
-        @thread.join
-        log.debug \
-          "Disconnected ssh connection to host '#{ssh_user}@#{ssh_host}'"
-      end
-
-      def ssh_user
-        options[:ssh_user] = 'core'
-      end
-
-      def ssh_host
-        options[:ssh_host]
-      end
-
-      def ssh_port
-        options[:ssh_port] || 22
-      end
-
-      def remote_host
-        options[:remote_host]
-      end
-
-      def remote_port
-        options[:remote_port]
-      end
-
-      def local_port
-        options[:local_port] || remote_port
-      end
     end
   end
 end

data/lib/picsolve_docker_builder/nodejs.rb

@@ -16,8 +16,7 @@ module PicsolveDockerBuilder
       c['nodejs'] = {
         'build_commands' => [
           'npm install',
-          'grunt',
-          'tar cvzf html.tar.gz -C frontend/dist .'
+          'grunt jenkins'
         ]
       }
       c
@@ -35,8 +34,8 @@ module PicsolveDockerBuilder
     def docker_build_files
       f = []
       f << Builder::File.new(
-        'app.tar.gz',
-        source: File.join(base_dir, 'html.tar.gz'),
+        'dist.tar.gz',
+        source: File.join(base_dir, 'dist.tar.gz'),
         destination: '/var/www/html'
       )
 
@@ -126,10 +125,5 @@ module PicsolveDockerBuilder
 
       stop
     end
-
-    def build
-      asset_build
-      docker_build
-    end
   end
 end

data/lib/picsolve_docker_builder/scala.rb

@@ -187,10 +187,5 @@ module PicsolveDockerBuilder
         if tgz_files.length > 1
       tgz_files[0]
     end
-
-    def build
-      asset_build
-      docker_build
-    end
   end
 end

data/lib/picsolve_docker_builder/version.rb

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

data/picsolve_docker_builder.gemspec

@@ -29,7 +29,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'simplecov-cobertura'
   spec.add_dependency 'rake', '~> 10.0'
-  spec.add_dependency 'kubeclient', '~> 0.3.0'
+  spec.add_dependency 'kubeclient', '~> 0.5.1'
   spec.add_dependency 'docker-api'
   spec.add_dependency 'net-ssh'
+  spec.add_dependency 'pg'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picsolve_docker_builder
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Christian Simon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  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
@@ -232,6 +246,10 @@ files:
 - 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
+- lib/picsolve_docker_builder/composer/requirements/context.rb
+- lib/picsolve_docker_builder/composer/requirements/postgres.rb
 - lib/picsolve_docker_builder/frame.rb
 - lib/picsolve_docker_builder/helpers/config/base.rb
 - lib/picsolve_docker_builder/helpers/config/secret.rb
@@ -241,9 +259,12 @@ files:
 - lib/picsolve_docker_builder/helpers/kubernetes/pod.rb
 - lib/picsolve_docker_builder/helpers/kubernetes/rc.rb
 - lib/picsolve_docker_builder/helpers/kubernetes/resource.rb
+- lib/picsolve_docker_builder/helpers/kubernetes/secret.rb
 - lib/picsolve_docker_builder/helpers/kubernetes/service.rb
 - lib/picsolve_docker_builder/helpers/kubernetes_manager.rb
+- lib/picsolve_docker_builder/helpers/registry.rb
 - lib/picsolve_docker_builder/helpers/repository.rb
+- lib/picsolve_docker_builder/helpers/ssh_connection.rb
 - lib/picsolve_docker_builder/helpers/ssh_forward.rb
 - lib/picsolve_docker_builder/nodejs.rb
 - lib/picsolve_docker_builder/scala.rb