minke 1.14.4 → 1.14.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a89aafcf58e2970ad8bb9362087ed32b9dc448ab
-  data.tar.gz: d45c5c49a4cb35ea6788a4eebc66c6ab45019d60
+  metadata.gz: e6a7b8b60ccbed410eeb27018feca48de863eb62
+  data.tar.gz: f7eff0ed28dbddfdd61b8f5ad4e8930c6820bb17
 SHA512:
-  metadata.gz: 6f36833bcb9e5dcd24abc2718e98f50facd2527824067490a6fac4a2670d068d4196e47377aa2b1c2f6518694da3544c253781015b5532915a6783612da3e0ae
-  data.tar.gz: 6adda85eca1419e66d27a6e765d04e7b0e3960c34817c11b6999843151e45643c9e4a118a1b8aa0dc6dd60bd6092ea05afbcde5bb50c69c519c7db7219b47cd7
+  metadata.gz: 4320dc51fffbf2605acd2a775e706d6b818f767e9adac3263f759eac4b23b0f23e7a02a3a6f10b3ef715db728c9854c8fe1fb763ab1e58e681a58c038f7ba156
+  data.tar.gz: 36e008f6e038ef2f70728d57d436d7f7d660928c63f07754d16a1e385ce6b5c52e38dd9353839a39fe6b0dd21647a34f341da992539d3f1c6487b13b6322a255

data/.travis.yml

@@ -30,7 +30,7 @@ after_deploy:
     docker build -t nicholasjackson/minke --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` --build-arg VCS_REF=`git rev-parse --short HEAD` .;
     docker login -e="$DOCKER_EMAIL" -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
     docker push nicholasjackson/minke:latest;
-    docker tag nicholasjackson/minke nicholasjackson/minke:1.14.4;
-    docker push nicholasjackson/minke:1.14.4;
+    docker tag nicholasjackson/minke nicholasjackson/minke:1.14.5;
+    docker push nicholasjackson/minke:1.14.5;
     curl https://hooks.microbadger.com/images/nicholasjackson/minke/tkpohfdrYPE0B0TL5NzLcOap4k0=;
     fi

data/docker/Gemfile

@@ -3,8 +3,8 @@ source 'https://rubygems.org'
 gem "rake"
 gem "cucumber"
 
-gem 'minke', "= 1.14.4"
+gem 'minke', "= 1.14.5"
 gem 'minke-generator-swift', "= 0.4"
 gem 'minke-generator-netmvc'
-gem 'minke-generator-go', "= 0.9.2"
+gem 'minke-generator-go', "= 0.9.3"
 gem 'minke-generator-spring'

data/lib/minke/docker/docker_runner.rb

@@ -45,7 +45,6 @@ module Minke
       ##
       # pull_image pulls a new copy of the given image from the registry
       def pull_image image_name
-      	@logger.debug "Pulling Image: #{image_name}"
         ::Docker.options = {:chunk_size => 1, :read_timeout => 3600}
         ::Docker::Image.create('fromImage' => image_name)
       end
@@ -75,7 +74,7 @@ module Minke
       		'Cmd'             => args[:command],
       		"Binds"           => args[:volumes],
       		"Env"             => args[:environment],
-          'NetworkMode'         => @network,
+          'NetworkMode'     => @network,
       		'WorkingDir'      => args[:working_directory],
           'name'            => args[:name],
           'PublishAllPorts' => true
@@ -167,9 +166,8 @@ module Minke
         begin
           ::Docker::Image.build_from_dir(dockerfile_dir, {:t => name}) do |v|
             data = /{"stream.*:"(.*)".*/.match(v)
-            data = data[1].encode(Encoding.find('UTF-8'), {invalid: :replace, undef: :replace, replace: ''}) unless data == nil || data.length < 1
-            data.chomp('\n')
-            $stdout.puts data unless data == nil
+            data = data[1].encode(Encoding.find('UTF-8'), {invalid: :replace, undef: :replace, replace: ''}).chomp('/n') unless data == nil || data.length < 1
+            @logger.info data unless data == nil
           end
         rescue => e
           message = e.message

data/lib/minke/scripts/minke

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-MINKE_VERSION="1.14.4"
+MINKE_VERSION="1.14.5"
 
 DOCKER_SOCK="/var/run/docker.sock:/var/run/docker.sock"
 NEW_UUID=$(base64 /dev/urandom | tr -d '/+' | head -c 32 | tr '[:upper:]' '[:lower:]')

data/lib/minke/tasks/task.rb

@@ -66,7 +66,7 @@ module Minke
       def run_command_in_container(command, blocking = false, links = nil, ports = nil)
         begin
           @logger.info "Running command: #{command}"
-          settings = @generator_config.build_settings.docker_settings
+          settings          = @generator_config.build_settings.docker_settings
           volumes           = settings.binds.clone unless settings.binds == nil
           environment       = settings.env.clone unless settings.env == nil
           build_image       = create_container_image
@@ -121,8 +121,10 @@ module Minke
           @logger.debug "Building image: #{build_image} from file #{build_file}"
           @docker_runner.build_image build_file, build_image
         else
-          @logger.debug "Pulling image: #{build_image}"
-          @docker_runner.pull_image build_image unless @docker_runner.find_image build_image
+          if (@docker_runner.find_image build_image) == nil
+            @logger.debug "Pulling image: #{build_image}"
+            @docker_runner.pull_image build_image         
+          end
         end
 
         build_image

data/lib/minke/version.rb

@@ -1,3 +1,3 @@
 module Minke
-  VERSION = "1.14.4"
+  VERSION = "1.14.5"
 end

metadata

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