freighter 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f46424de56a54174c0feeb60213a0802bbd2f1d9
-  data.tar.gz: 884308db7063d5319f0bf5e34c63b9abb629cb83
+  metadata.gz: 8295dacb935aa96503b1e287db0ad5bfb1d49545
+  data.tar.gz: 22499c6310016cae6382180d39f3a1469155a90e
 SHA512:
-  metadata.gz: e658a0d63238b37b3ee9bc1bed406e6a075a533f819cde405c3ddfbc8ca912ce4fc2345f65f416c407e22e92c9531b1dcc00dff5c712f5180b2384015e8ce4a4
-  data.tar.gz: 6b3d156462bcf74cca7ba5ab9ee1830bacec6816571f0ad572880beed8d39d198210b4e8c4eaab459c6db9088341dd9d8b069a5330f9d50ab4e746948e3be0ac
+  metadata.gz: cba0a378011e59479b5324f0fd23826f9fa3ed6b0183ea105ca3d4e14da0aeb9d3e88c9cd59d5c59bde380fb137c0863b622e4f5931a48c66b063eeae6a8d11f
+  data.tar.gz: 1a8327c1c358cb05cccb18316e32c5b13055de192113d0b4b311ddd26bc55f1786a680b8746f5b835fa21954842925b1ad5f3c3fd87587108d9ecb1f8c6d0379

data/README.md

@@ -7,6 +7,7 @@ Freighter goals:
 * Straight forward configuration
 * Users new to freighter should be able to deploy in minutes
 * Minimal server-side configuration
+* Clean up old containers and images that are not being used
 * Fast and reliable
 
 ## Installation
@@ -177,15 +178,12 @@ If you find yourself in a pickle of not being able to Ctrl+c (interrupt) the com
 
 # Status
 
+Freighter is currently deploying quickly and reliably as far as I can tell.
+
 Needed:
 * Needs more testing with more complex scenarios
-
-Nice to haves:
 * Container linking options
 * Volume mounting options
-* Container cleanup
-
-Freighter is currently deploying quickly and reliably as far as I can tell.
 
 ## Contributing
 

data/lib/freighter/deploy.rb

@@ -127,17 +127,21 @@ module Freighter
 
       def containers_matching_port_map(containers, port_mappings)
         port_mappings.map do |port_map|
-          ports = ports(port_map)
+          ports = map_ports(port_map)
           containers.select do |c|
             c.info['Ports'].detect do |p|
               p['PrivatePort'] == ports.container && p['PublicPort'] == ports.host
             end
           end
-        end.flatten
+        end.compact.flatten
       end
 
       PortMap = Struct.new(:ip, :host, :container)
-      def ports(port_map)
+      def map_ports(port_map)
+        # for some unknown reason, containers started without a port mapping specified
+        # are getting a default port mapping of 80/tcp. This is why a default port map is 
+        # being assigned to port 80
+        return PortMap.new(nil, nil, 80) if port_map.nil?
         port_map.match(/^(\d{1,3}\.[\.0-9]*)?:?(\d+)->(\d+)$/)
         begin
           raise if $2.nil? or $3.nil?
@@ -163,21 +167,30 @@ module Freighter
 
         # start up some new containers
         image['containers'].map do |container|
-          port_map = ports(container['port_mapping'])
+          port_map = map_ports(container['port_mapping'])
 
           # env = container['env'].inject("") { |r, (k,v)| r << "#{k}='#{v}',\n" }
           env = container['env'].map { |k,v| "#{k}=#{v}" }
           container_options = {
             "Image" => image['name'],
-            "ExposedPorts" => { "#{port_map.container}/tcp" => {} },
             "Env" => env
           }
 
+          start_options = {}
+
+          if port_map.host
+            container_options.merge!({ "ExposedPorts" => { "#{port_map.container}/tcp" => {} } })
+            start_options.merge!({
+              "PortBindings" => {
+                "#{port_map.container}/tcp" => [{ "HostPort" => port_map.host.to_s, "HostIp" => port_map.ip }]
+              }
+            })
+            logger.info msg "Starting container with port_mapping: host #{[port_map.ip, port_map.host].join(':')}, container #{port_map.container}"
+          end
+
           new_container = Docker::Container.create container_options
-          logger.info msg "Starting container with port_mapping: host #{[port_map.ip, port_map.host].join(':')}, container #{port_map.container}"
-          new_container.start(
-            "PortBindings" => { "#{port_map.container}/tcp" => [{ "HostPort" => port_map.host.to_s, "HostIp" => port_map.ip }] }
-          )
+
+          new_container.start start_options
           totals[:container_ids_started] << new_container.id
           logger.info msg "New container started with id: #{new_container.id}"
           totals[:started] += 1

data/lib/freighter/version.rb

@@ -1,3 +1,3 @@
 module Freighter
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: freighter
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Sean McCleary