hako 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75892b3b69615c52673725212b96726f9fea58e7
-  data.tar.gz: d7a251bac15bccd07635017584b9a86bdb172598
+  metadata.gz: 1e64f878fa8086ac6bbf25618270783b624a0c3d
+  data.tar.gz: 3bd05c5d3570b3df3683bf96089ba27601e23eab
 SHA512:
-  metadata.gz: 163e6241ce9816ed44c1125e0499248ba2721bfd10666e3e065ca3806252a45a5aa1a3af503fef13b23066dffbd455a36fbb91e1965263b6c1aa7ede47d68f88
-  data.tar.gz: 8e35712fb370b7a7f1ff1bea881b20556a85ad00944c6fa8901e6ec2ac8dd552baff607a7a49ac991b02434dece2c9f2729fbc821b6d86a0bd1aed838b5f92af
+  metadata.gz: 668a80d0f435cdd3ee046af0d3795567f32074fc68bcd8fb6afaec5cbd0023642414771a76c8441b7a7b0acc0d662e00e3cbd229137d068bb2e72a2d15ef8b75
+  data.tar.gz: 88df5fc4b0c681f4fbce9422979f9d50cbde3742760940a9351380bffba3a2a30beae92326da39db808dc5fa58e067c0322acc9b2d1ee9f30b27c52a4b6c695d

data/examples/hello-lb.yml

@@ -15,8 +15,8 @@ scheduler:
       - sg-ZZZZZZZZ
 app:
   image: ryotarai/hello-sinatra
-  memory: 100
-  cpu: 100
+  memory: 128
+  cpu: 256
   port: 3000
   env:
     $providers:
@@ -27,8 +27,8 @@ app:
 front:
   type: nginx
   image_tag: hako-nginx
-  memory: 100
-  cpu: 100
+  memory: 32
+  cpu: 32
   s3:
     region: ap-northeast-1
     bucket: nanika

data/examples/hello.yml

@@ -5,9 +5,11 @@ scheduler:
   desired_count: 2
 app:
   image: ryotarai/hello-sinatra
-  memory: 100
-  cpu: 100
+  memory: 128
+  cpu: 256
   port: 3000
+  links:
+    - redis:redis
   env:
     $providers:
       - type: file
@@ -17,9 +19,14 @@ app:
 front:
   type: nginx
   image_tag: hako-nginx
-  memory: 100
-  cpu: 100
+  memory: 32
+  cpu: 32
   s3:
     region: ap-northeast-1
     bucket: nanika
     prefix: hako/front_config
+additional_containers:
+  redis:
+    image_tag: redis:3.0
+    cpu: 64
+    memory: 512

data/lib/hako/commander.rb

@@ -1,4 +1,5 @@
 require 'hako/app_container'
+require 'hako/container'
 require 'hako/env_expander'
 require 'hako/error'
 require 'hako/fronts'
@@ -19,6 +20,9 @@ module Hako
       scripts = @app.yaml.fetch('scripts', []).map { |config| load_script(config) }
 
       containers = { 'app' => app, 'front' => front }
+      @app.yaml.fetch('additional_containers', {}).each do |name, container|
+        containers[name] = Container.new(@app, container)
+      end
       scripts.each { |script| script.before_deploy(containers) }
       scheduler.deploy(containers, force: force)
       scripts.each { |script| script.after_deploy(containers) }

data/lib/hako/container.rb

@@ -2,11 +2,12 @@ module Hako
   class Container
     DEFAULT_CONFIG = {
       'docker_labels' => {},
+      'links' => [],
     }.freeze
 
     def initialize(app, definition)
       @app = app
-      @definition = definition.merge(DEFAULT_CONFIG)
+      @definition = DEFAULT_CONFIG.merge(definition)
     end
 
     %w[
@@ -14,6 +15,7 @@ module Hako
       docker_labels
       cpu
       memory
+      links
     ].each do |name|
       define_method(name) do
         @definition[name]

data/lib/hako/front.rb

@@ -33,6 +33,12 @@ module Hako
       )
     end
 
+    DEFAULT_LINK = ['app:app'].freeze
+
+    def links
+      DEFAULT_LINK + super
+    end
+
     def extra
       @definition.fetch('extra', {})
     end

data/lib/hako/schedulers/ecs.rb

@@ -166,12 +166,12 @@ module Hako
         task_definition.container_definitions.each do |c|
           container_definitions[c.name] = c
         end
-        if container_definitions.size == 2 && container_definitions['front'] && container_definitions['app']
+        if container_definitions['front']
           container_definitions['front'].port_mappings[0].host_port
         end
       end
 
-      def task_definition_changed?(front, app)
+      def task_definition_changed?(definitions)
         if @force_mode
           return true
         end
@@ -180,7 +180,10 @@ module Hako
         task_definition.container_definitions.each do |c|
           container_definitions[c.name] = c
         end
-        different_definition?(front, container_definitions['front']) || different_definition?(app, container_definitions['app'])
+        if definitions.any? { |definition| different_definition?(definition, container_definitions.delete(definition[:name])) }
+          return true
+        end
+        !container_definitions.empty?
       rescue Aws::ECS::Errors::ClientException
         # Task definition does not exist
         true
@@ -191,12 +194,18 @@ module Hako
       end
 
       def register_task_definition(containers, front_port)
-        front_def = front_container(containers.fetch('front'), front_port)
-        app_def = app_container(containers.fetch('app'))
-        if task_definition_changed?(front_def, app_def)
+        definitions = containers.map do |name, container|
+          case name
+          when 'front'
+            front_container(container, front_port)
+          else
+            app_container(name, container)
+          end
+        end
+        if task_definition_changed?(definitions)
           @ecs.register_task_definition(
             family: @app_id,
-            container_definitions: [front_def, app_def],
+            container_definitions: definitions,
           ).task_definition
         else
           :noop
@@ -227,7 +236,7 @@ module Hako
           image: front.image_tag,
           cpu: front.cpu,
           memory: front.memory,
-          links: ['app:app'],
+          links: front.links,
           port_mappings: [{ container_port: 80, host_port: front_port, protocol: 'tcp' }],
           essential: true,
           environment: environment,
@@ -235,14 +244,14 @@ module Hako
         }
       end
 
-      def app_container(app)
+      def app_container(name, app)
         environment = app.env.map { |k, v| { name: k, value: v } }
         {
-          name: 'app',
+          name: name,
           image: app.image_tag,
           cpu: app.cpu,
           memory: app.memory,
-          links: [],
+          links: app.links,
           port_mappings: [],
           essential: true,
           environment: environment,

data/lib/hako/version.rb

@@ -1,3 +1,3 @@
 module Hako
-  VERSION = '0.5.1'.freeze
+  VERSION = '0.6.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk