minke 1.14.0 → 1.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a75b7d20dfa4be64d0c2624adce3b9f9e25ec3ea
-  data.tar.gz: 681b7ff115b1b9c411cae5cd893f1d627f11c531
+  metadata.gz: 97c33c7f7fd702358fb6091c3520b45fc1f7a17c
+  data.tar.gz: 2e17caa1c46785d9ca1e00b0e70979506fb00388
 SHA512:
-  metadata.gz: 40f40d0ad96bb89401230a08b99001e98993accb2cfd72c899ba27bf86f506efedec85d6de500186a52b5994801875df6eb719c2d82e849f72f0a4eb197795f1
-  data.tar.gz: ec4dd302f0844486acbc3d816d377bb03e7a2470a5390f03244046ba36c14322d31e65dfd8ac3adc820a63871cf3c7f6e9999c815eb1411cf910e012f4164420
+  metadata.gz: 68a625d619a2b710d61023d60b966dbf30fe3056b4aa55c768439a2d7c2205db72a873493307396e57f84d79c7c50d68b3396ae2ffbb91daa67a93ed284b04a0
+  data.tar.gz: 5f87d6bedc1685a06dd7a259bbf5382a9a90028be55af1f9f64ea76964f6ddb405d18c9a4e954a734cfba3c3bfb2867e4864acde37cc86043b5b42322288c129

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.0;
-    docker push nicholasjackson/minke:1.14.0;
+    docker tag nicholasjackson/minke nicholasjackson/minke:1.14.1;
+    docker push nicholasjackson/minke:1.14.1;
     curl https://hooks.microbadger.com/images/nicholasjackson/minke/tkpohfdrYPE0B0TL5NzLcOap4k0=;
     fi

data/docker/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gem "rake"
 gem "cucumber"
 
-gem 'minke', "= 1.14.0"
+gem 'minke', "= 1.14.1"
 gem 'minke-generator-swift', "= 0.4"
 gem 'minke-generator-netmvc'
 gem 'minke-generator-go', "= 0.8.6"

data/lib/minke/generators/processor.rb

@@ -37,8 +37,8 @@ module Minke
         end
 
         # write the shell script
-        Minke::Generators::write_bash_script output_folder + "/_build/minke"
-        Minke::Generators::create_rvm_files output_folder + "/_build/", @variables.application_name
+        Minke::Generators::write_bash_script output_folder + "/_minke/minke"
+        Minke::Generators::create_rvm_files output_folder + "/_minke/", @variables.application_name
       end
 
       def build_image docker_file
@@ -56,12 +56,18 @@ module Minke
       def run_command_in_container build_image, command
         @logger.debug command
         begin
-          container, success = @docker_runner.create_and_run_container build_image, ["#{File.expand_path(@variables.src_root)}:/src"], nil, '/src', command
+          args = {
+            :image             => build_image, 
+            :volumes           => ["#{File.expand_path(@variables.src_root)}:/src"],
+            :working_directory => '/src', 
+            :command           => command
+          }
 
+
+          container, success = @docker_runner.create_and_run_container args
+          
           # throw exception if failed
           raise " #{command}" unless success
-          #command = Minke::Helpers.replace_vars_in_section generator.generate_command, '##SERVICE_NAME##', APPLICATION_NAME
-          #container, ret = Minke::Docker.create_and_run_container config, command
         ensure
           @docker_runner.delete_container container
         end

data/lib/minke/scripts/minke

@@ -1,5 +1,6 @@
 #!/bin/bash
-MINKE_VERSION="1.13.20"
+
+MINKE_VERSION="1.14.1"
 
 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/version.rb

@@ -1,3 +1,3 @@
 module Minke
-  VERSION = "1.14.0"
+  VERSION = "1.14.1"
 end

metadata

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