hako 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0982aa9c0d21c4c9d1455261f9217208900b3ac3
-  data.tar.gz: d6f4cf41df7fd6e3813d45c05e3fd2ee27761a34
+  metadata.gz: 7051366d540062e8a8d89a5e4a29d4fd439e53f9
+  data.tar.gz: de094d094bcc3773b789b3f4fbe12a24a9f64752
 SHA512:
-  metadata.gz: e4e791d18be1cdc58e21d6c45982300cdf6d1fd23576486267644c16526c1427f146c4f73eb0ff1b9e3e99fb998663bad7f7dfa07fc76394c39cdcbcd47c1d44
-  data.tar.gz: 0061c7fa160d2a24f86fe4cfd11bb558c9ddfcbc2c6241a80a35f8830523b86da33215063a1d556fa3e5144400d2e8f2c283f3357a1ed917663dfdd872e8c772
+  metadata.gz: 41d1331497077ed082ef86164f37b255a9a644444242ef208fb12e4a0301e3934ba63f2d7ec4e90587d286e2c600c46fc13c76b5665260aed3fc77cf367b6b2c
+  data.tar.gz: 812835ac65a95d396687eb2a8314d736e5351099669374f5765ecd9b1688451b9325cf4dc99f0308d4a8062271bbaa9749dc3080e39c27b2641667918d16c5f5

data/lib/hako/commander.rb

@@ -26,9 +26,10 @@ module Hako
       )
       scripts = @app.yaml.fetch('scripts', []).map { |config| load_script(config) }
 
-      scripts.each { |script| script.before_deploy(app) }
-      scheduler.deploy(app, env, app_port, front, force: force)
-      scripts.each { |script| script.after_deploy(app) }
+      containers = { 'app' => app, 'front' => front }
+      scripts.each { |script| script.before_deploy(containers) }
+      scheduler.deploy(containers, env, app_port, force: force)
+      scripts.each { |script| script.after_deploy(containers) }
     end
 
     def oneshot(commands, tag: 'latest')

data/lib/hako/container.rb

@@ -1,7 +1,11 @@
 module Hako
   class Container
+    DEFAULT_CONFIG = {
+      'docker_labels' => {},
+    }.freeze
+
     def initialize(definition)
-      @definition = definition
+      @definition = definition.merge(DEFAULT_CONFIG)
     end
 
     %w[

data/lib/hako/front_config.rb

@@ -1,7 +1,8 @@
 require 'erb'
+require 'hako/container'
 
 module Hako
-  FrontConfig = Struct.new(:type, :image_tag, :s3, :extra)
+  FrontConfig = Struct.new(:type, :container, :s3, :extra)
   class FrontConfig
     S3Config = Struct.new(:region, :bucket, :prefix) do
       def initialize(options)
@@ -21,7 +22,9 @@ module Hako
 
     def initialize(options)
       self.type = options.fetch('type')
-      self.image_tag = options.fetch('image_tag')
+      self.container = Container.new(
+        'image_tag' => options.fetch('image_tag'),
+      )
       self.s3 = S3Config.new(options.fetch('s3'))
       self.extra = options.fetch('extra', {})
     end

data/lib/hako/scheduler.rb

@@ -8,7 +8,7 @@ module Hako
     def initialize(_app_id, _options)
     end
 
-    def deploy(_app, _env, _app_port, _front_config, _options)
+    def deploy(_containers, _env, _app_port, _options)
       raise NotImplementedError
     end
 

data/lib/hako/schedulers/echo.rb

@@ -7,8 +7,8 @@ module Hako
         @app_id = app_id
       end
 
-      def deploy(app, env, app_port, _front, force: false)
-        puts "Deploy #{app.image_tag} with app_port=#{app_port}, force=#{force}"
+      def deploy(containers, env, app_port, force: false)
+        puts "Deploy #{containers.fetch('app').image_tag} with app_port=#{app_port}, force=#{force}"
         puts 'Environment variables:'
         env.each do |key, val|
           puts "  #{key}=#{val.inspect}"

data/lib/hako/schedulers/ecs.rb

@@ -23,8 +23,10 @@ module Hako
         @ec2 = Aws::EC2::Client.new(region: region)
       end
 
-      def deploy(app, env, app_port, front, force: false)
+      def deploy(containers, env, app_port, force: false)
         @force_mode = force
+        app = containers.fetch('app')
+        front = containers.fetch('front')
         front_env = {
           'AWS_DEFAULT_REGION' => front.config.s3.region,
           'S3_CONFIG_BUCKET' => front.config.s3.bucket,
@@ -229,13 +231,14 @@ module Hako
         environment = env.map { |k, v| { name: k, value: v } }
         {
           name: 'front',
-          image: front_config.image_tag,
+          image: front_config.container.image_tag,
           cpu: 100,
           memory: 100,
           links: ['app:app'],
           port_mappings: [{ container_port: 80, host_port: front_port, protocol: 'tcp' }],
           essential: true,
           environment: environment,
+          docker_labels: front_config.container.docker_labels,
         }
       end
 

data/lib/hako/version.rb

@@ -1,3 +1,3 @@
 module Hako
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.4.0'.freeze
 end

metadata

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