hako 0.17.2 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: daada56b5f8aa658441ff166bc8edd230092b102
-  data.tar.gz: 68a71148392934f2dcf224bdf0dc6fbc509cc0b9
+  metadata.gz: a30c23443a235e245cf7581ac2e8370958e52431
+  data.tar.gz: ec03c2205e76f980d0067273ffc7b7cd7a8889d3
 SHA512:
-  metadata.gz: 3477cb28ef35a80024402bb8c2da2b9d1b07adc5548c34682719334a6164f338373a18a2c29c727fcbf701708bd27590a23f851f5a49b224e67dade7cedf5041
-  data.tar.gz: 7dafec4447c9f78de768895ff42eabba9ebbc30ede6b6bb157f335e7b94c0b2d25e72cae91a0391c545d0de367f481e56ae8e13a7b7463d332dacaa4e45e33ee
+  metadata.gz: ceaa7c3d218036910d962f867a6a1236ea821db4dca6a732504188638165394891e56b9098fec28cbe93d5a9c368f97d7244011004912d6919aa06dd49347c0f
+  data.tar.gz: ed0e28623c75f4bc09a9bb99c70faf52e1d63f6ed10c9cd8a9ee1ce7303955db329dbb3230ae35bff3d3ef2549e688637c5bb30ad771502e6aa64128eda0f54b

data/examples/hello-autoscaling.yml

@@ -36,7 +36,6 @@ app:
   image: ryotarai/hello-sinatra
   memory: 128
   cpu: 256
-  port: 3000
   env:
     $providers:
       - type: file
@@ -50,6 +49,7 @@ additional_containers:
     cpu: 32
 scripts:
   - <<: !include front.yml
+    backend_port: 3000
     locations:
       /:
         allow_only_from:

data/examples/hello-lb.yml

@@ -17,7 +17,6 @@ app:
   image: ryotarai/hello-sinatra
   memory: 128
   cpu: 256
-  port: 3000
   env:
     $providers:
       - type: file
@@ -31,6 +30,7 @@ additional_containers:
     cpu: 32
 scripts:
   - <<: !include front.yml
+    backend_port: 3000
     locations:
       /:
         allow_only_from:

data/examples/hello.yml

@@ -8,7 +8,6 @@ app:
   image: ryotarai/hello-sinatra
   memory: 128
   cpu: 256
-  port: 3000
   links:
     - redis:redis
   env:
@@ -27,4 +26,5 @@ additional_containers:
     cpu: 64
     memory: 512
 scripts:
-  - !include front.yml
+  - <<: !include front.yml
+    backend_port: 3000

data/lib/hako/app_container.rb

@@ -7,10 +7,5 @@ module Hako
     def image_tag
       "#{@definition['image']}:#{@definition['tag']}"
     end
-
-    # @return [Fixnum]
-    def port
-      @definition['port']
-    end
   end
 end

data/lib/hako/scripts/nginx_front.rb

@@ -40,11 +40,10 @@ module Hako
       # @param [Fixnum] front_port
       # @return [nil]
       def deploy_started(containers, front_port)
-        app = containers.fetch('app')
         front = containers.fetch('front')
         front.definition['port_mappings'] << port_mapping(front_port)
-        upload_config(generate_config(app.port))
-        Hako.logger.debug "Uploaded front configuration to s3://#{@s3.bucket}/#{@s3.key(@app.id)}"
+        upload_config(generate_config)
+        Hako.logger.info "Uploaded front configuration to s3://#{@s3.bucket}/#{@s3.key(@app.id)}"
       end
 
       private
@@ -55,12 +54,13 @@ module Hako
         super
         @options = options
         @options['locations'] ||= { '/' => {} }
-        @s3 = S3Config.new(@options.fetch('s3'))
+        @backend = options.fetch('backend', 'app')
+        @s3 = S3Config.new(options.fetch('s3'))
       end
 
       # @return [String]
       def link_app
-        'app:app'
+        "#{@backend}:backend"
       end
 
       # @param [Fixnum] front_port
@@ -69,10 +69,9 @@ module Hako
         { container_port: 80, host_port: front_port, protocol: 'tcp' }
       end
 
-      # @param [Fixnum] app_port
       # @return [String]
-      def generate_config(app_port)
-        Generator.new(@options, app_port).render
+      def generate_config
+        Generator.new(@options).render
       end
 
       # @return [Hash]
@@ -95,10 +94,9 @@ module Hako
 
       class Generator
         # @param [Hash] options
-        # @param [Fixnum] app_port
-        def initialize(options, app_port)
+        def initialize(options)
           @options = options
-          @app_port = app_port
+          @backend_port = options.fetch('backend_port')
         end
 
         # @return [String]
@@ -110,7 +108,7 @@ module Hako
 
         # @return [String]
         def listen_spec
-          "app:#{@app_port}"
+          "backend:#{@backend_port}"
         end
 
         # @return [String]

data/lib/hako/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hako
-  VERSION = '0.17.2'
+  VERSION = '0.18.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.18.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2016-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -170,4 +170,3 @@ signing_key:
 specification_version: 4
 summary: Deploy Docker container
 test_files: []
-has_rdoc: