minke 1.0.2 → 1.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2VlY2ZlYTMyYTU5NDIyYWEwODQwYzk2MDk2ZDJmNWFlMjE2MTcxOQ==
+    NDY2MjFhZTEwZjI5OGY0MGFjZDVkYjVkMmViYWI5NDIzNDBhOTdiYg==
   data.tar.gz: !binary |-
-    NzZlMjRkZjFhNTQ0YTI1Y2ZjM2RiMWQzZDQ5YTQ1NDJiYjczOWY0OA==
+    YzIyM2IwMGIwNGMyNDU3MjE3Njg1YjAzZDk0YWY2NzFhM2IxZTU2Zg==
 SHA512:
   metadata.gz: !binary |-
-    NGU0ODFmMTI5OTVhZmQ3YjhiOTliMzM4ZTY1NTU0MWU5NDZlN2E1MjFiNWRk
-    MWY5NTk5ZDY0NTMzMTFlZTc5ZjJlMGE1ZWFmODM5ZmMxZGQzY2QwMWE5Mjg5
-    ZjE4YzZiZjA0YjM0ZTA3NTJkYzkwOGE1NDQ1MmRmYjg1NmM2NGI=
+    MGM4M2UyMzZmZmMyYzhhZTFmZWVhMDZiZDMyNDE1NDE1ODBhYzFjNjIxMWE5
+    MjJiZWQzODFjMTFhYWNkMTc1MDU0NzBiYjM5OGI1YjU1ZWM2Y2M3ZDE2MmMx
+    YTEyY2I0NWMzNTI5ZmU3ZDc5NjI3MDBmMDkyMmJmYmMwNmFkZTY=
   data.tar.gz: !binary |-
-    MmU4ZDA1ZWQzODRlNzY2ZGI5MGEyZmY2NzA3ZjFjZTIxNzc5NmM1Mjc3Mjkz
-    NGVkMTE2YWYxZmU4M2Y1ZjEzYjk4OGUwZWRjN2M1YjM2YzI3Mjc3ZTdmOTM3
-    MmUxOTExOGFhNzU3ZDI5ZjJiZWQ2MjczOGQ2Njg5MTA3NjQxODc=
+    MThmMTExOGM4NzIzMzc2OGFhODZiZTliNDMxYTJjMGZiYTQ3YzdmMDAyZWE2
+    ZjZlMTkzZDA3YWE3NWJiOTJiN2Y0NzU5ZDNkMjhiYzcxYTAzNGQxODBkMDE0
+    YzM4N2RkMTBkZDJkNjdmZTA1NDhmYjdmNGQ3OWZiYTVhMzRiNjY=

data/lib/minke/docker/docker_runner.rb

@@ -4,18 +4,16 @@ module Minke
       ##
       # returns the ip address that docker is running on
       def get_docker_ip_address
-        if ENV['DOCKER_IP'] == nil
-          if ENV['DOCKER_HOST']
-        		# dockerhost set
-        		host = ENV['DOCKER_HOST'].dup
-        		host.gsub!(/tcp:\/\//, '')
-        		host.gsub!(/:\d+/,'')
-
-        		return host
-          else
-            return '127.0.0.1'
-        	end
-        end
+        if ENV['DOCKER_HOST']
+      		# dockerhost set
+      		host = ENV['DOCKER_HOST'].dup
+      		host.gsub!(/tcp:\/\//, '')
+      		host.gsub!(/:\d+/,'')
+
+      		return host
+        else
+          return '127.0.0.1'
+      	end
       end
 
       ##

data/lib/minke/rake/app.rake

@@ -1,7 +1,7 @@
 namespace :app do
 
   desc "fetch dependent packages"
-  task :fetch => ['config:set_docker_env', 'docker:fetch_images'] do
+  task :fetch => ['config:set_docker_env'] do
     create_dependencies
 
     if @config.fetch != nil

data/lib/minke/tasks/task.rb

@@ -70,6 +70,8 @@ module Minke
           if @build_file != nil
             @build_image = "#{@config.application_name}-buildimage"
             @docker_runner.build_image @build_file, @build_image
+          else
+            @docker_runner.pull_image @build_image unless @docker_runner.find_image @build_image
           end
 
           container, success = @docker_runner.create_and_run_container @build_image, settings.binds, settings.env, settings.working_directory, command
@@ -85,7 +87,14 @@ module Minke
         if url.type == 'public'
           "#{url.protocol}://#{url.address}:#{url.port}#{url.path}"
         else
+          # if running on docker for mac we need to replace the ip address with the docker hosts
           public_address = @compose.public_address url.address, url.port
+
+          ip = @docker_runner.get_docker_ip_address
+          if  ip != "127.0.0.1" && ip != "0.0.0.0" && ip != nil
+            public_address.gsub!('0.0.0.0', ip)
+          end
+
           "#{url.protocol}://#{public_address}#{url.path}"
         end
       end

data/lib/minke/version.rb

@@ -1,3 +1,3 @@
 module Minke
-  VERSION = "1.0.2"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minke
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Nic Jackson