minke 1.14.4 → 1.14.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a89aafcf58e2970ad8bb9362087ed32b9dc448ab
4
- data.tar.gz: d45c5c49a4cb35ea6788a4eebc66c6ab45019d60
3
+ metadata.gz: e6a7b8b60ccbed410eeb27018feca48de863eb62
4
+ data.tar.gz: f7eff0ed28dbddfdd61b8f5ad4e8930c6820bb17
5
5
  SHA512:
6
- metadata.gz: 6f36833bcb9e5dcd24abc2718e98f50facd2527824067490a6fac4a2670d068d4196e47377aa2b1c2f6518694da3544c253781015b5532915a6783612da3e0ae
7
- data.tar.gz: 6adda85eca1419e66d27a6e765d04e7b0e3960c34817c11b6999843151e45643c9e4a118a1b8aa0dc6dd60bd6092ea05afbcde5bb50c69c519c7db7219b47cd7
6
+ metadata.gz: 4320dc51fffbf2605acd2a775e706d6b818f767e9adac3263f759eac4b23b0f23e7a02a3a6f10b3ef715db728c9854c8fe1fb763ab1e58e681a58c038f7ba156
7
+ data.tar.gz: 36e008f6e038ef2f70728d57d436d7f7d660928c63f07754d16a1e385ce6b5c52e38dd9353839a39fe6b0dd21647a34f341da992539d3f1c6487b13b6322a255
@@ -30,7 +30,7 @@ after_deploy:
30
30
  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` .;
31
31
  docker login -e="$DOCKER_EMAIL" -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
32
32
  docker push nicholasjackson/minke:latest;
33
- docker tag nicholasjackson/minke nicholasjackson/minke:1.14.4;
34
- docker push nicholasjackson/minke:1.14.4;
33
+ docker tag nicholasjackson/minke nicholasjackson/minke:1.14.5;
34
+ docker push nicholasjackson/minke:1.14.5;
35
35
  curl https://hooks.microbadger.com/images/nicholasjackson/minke/tkpohfdrYPE0B0TL5NzLcOap4k0=;
36
36
  fi
@@ -3,8 +3,8 @@ source 'https://rubygems.org'
3
3
  gem "rake"
4
4
  gem "cucumber"
5
5
 
6
- gem 'minke', "= 1.14.4"
6
+ gem 'minke', "= 1.14.5"
7
7
  gem 'minke-generator-swift', "= 0.4"
8
8
  gem 'minke-generator-netmvc'
9
- gem 'minke-generator-go', "= 0.9.2"
9
+ gem 'minke-generator-go', "= 0.9.3"
10
10
  gem 'minke-generator-spring'
@@ -45,7 +45,6 @@ module Minke
45
45
  ##
46
46
  # pull_image pulls a new copy of the given image from the registry
47
47
  def pull_image image_name
48
- @logger.debug "Pulling Image: #{image_name}"
49
48
  ::Docker.options = {:chunk_size => 1, :read_timeout => 3600}
50
49
  ::Docker::Image.create('fromImage' => image_name)
51
50
  end
@@ -75,7 +74,7 @@ module Minke
75
74
  'Cmd' => args[:command],
76
75
  "Binds" => args[:volumes],
77
76
  "Env" => args[:environment],
78
- 'NetworkMode' => @network,
77
+ 'NetworkMode' => @network,
79
78
  'WorkingDir' => args[:working_directory],
80
79
  'name' => args[:name],
81
80
  'PublishAllPorts' => true
@@ -167,9 +166,8 @@ module Minke
167
166
  begin
168
167
  ::Docker::Image.build_from_dir(dockerfile_dir, {:t => name}) do |v|
169
168
  data = /{"stream.*:"(.*)".*/.match(v)
170
- data = data[1].encode(Encoding.find('UTF-8'), {invalid: :replace, undef: :replace, replace: ''}) unless data == nil || data.length < 1
171
- data.chomp('\n')
172
- $stdout.puts data unless data == nil
169
+ data = data[1].encode(Encoding.find('UTF-8'), {invalid: :replace, undef: :replace, replace: ''}).chomp('/n') unless data == nil || data.length < 1
170
+ @logger.info data unless data == nil
173
171
  end
174
172
  rescue => e
175
173
  message = e.message
@@ -1,6 +1,6 @@
1
1
  #!/bin/bash
2
2
 
3
- MINKE_VERSION="1.14.4"
3
+ MINKE_VERSION="1.14.5"
4
4
 
5
5
  DOCKER_SOCK="/var/run/docker.sock:/var/run/docker.sock"
6
6
  NEW_UUID=$(base64 /dev/urandom | tr -d '/+' | head -c 32 | tr '[:upper:]' '[:lower:]')
@@ -66,7 +66,7 @@ module Minke
66
66
  def run_command_in_container(command, blocking = false, links = nil, ports = nil)
67
67
  begin
68
68
  @logger.info "Running command: #{command}"
69
- settings = @generator_config.build_settings.docker_settings
69
+ settings = @generator_config.build_settings.docker_settings
70
70
  volumes = settings.binds.clone unless settings.binds == nil
71
71
  environment = settings.env.clone unless settings.env == nil
72
72
  build_image = create_container_image
@@ -121,8 +121,10 @@ module Minke
121
121
  @logger.debug "Building image: #{build_image} from file #{build_file}"
122
122
  @docker_runner.build_image build_file, build_image
123
123
  else
124
- @logger.debug "Pulling image: #{build_image}"
125
- @docker_runner.pull_image build_image unless @docker_runner.find_image build_image
124
+ if (@docker_runner.find_image build_image) == nil
125
+ @logger.debug "Pulling image: #{build_image}"
126
+ @docker_runner.pull_image build_image
127
+ end
126
128
  end
127
129
 
128
130
  build_image
@@ -1,3 +1,3 @@
1
1
  module Minke
2
- VERSION = "1.14.4"
2
+ VERSION = "1.14.5"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: minke
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.14.4
4
+ version: 1.14.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nic Jackson