minke 1.14.1 → 1.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97c33c7f7fd702358fb6091c3520b45fc1f7a17c
-  data.tar.gz: 2e17caa1c46785d9ca1e00b0e70979506fb00388
+  metadata.gz: 3796c60b0992fa90f5b2408e24de7b731ea396cc
+  data.tar.gz: 395db562982e41ca0351c498458808248c91b149
 SHA512:
-  metadata.gz: 68a625d619a2b710d61023d60b966dbf30fe3056b4aa55c768439a2d7c2205db72a873493307396e57f84d79c7c50d68b3396ae2ffbb91daa67a93ed284b04a0
-  data.tar.gz: 5f87d6bedc1685a06dd7a259bbf5382a9a90028be55af1f9f64ea76964f6ddb405d18c9a4e954a734cfba3c3bfb2867e4864acde37cc86043b5b42322288c129
+  metadata.gz: ef53172cc692ab629f97a81fd97115fca54ba817ccdee931e970945c64bd708024d953f2ade1ed2e589ae6b3f886dcd330eb9505c019753f6f3ace0d7d261526
+  data.tar.gz: 5a68dee19e8eea1bec8881722f1e832e19a492e355f2e4613bea0405ad81e25f41f40fffe4ae650e8e4945c70373e826ebae3fde3fb5935a76217ad10b9bdf1c

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.1;
-    docker push nicholasjackson/minke:1.14.1;
+    docker tag nicholasjackson/minke nicholasjackson/minke:1.14.2;
+    docker push nicholasjackson/minke:1.14.2;
     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.1"
+gem 'minke', "= 1.14.2"
 gem 'minke-generator-swift', "= 0.4"
 gem 'minke-generator-netmvc'
-gem 'minke-generator-go', "= 0.8.6"
+gem 'minke-generator-go', "= 0.9.0"
 gem 'minke-generator-spring'

data/lib/minke/command.rb

@@ -18,12 +18,6 @@ module Minke
       logger = Minke::Logging.create_logger(self.verbose)
       shell = Minke::Helpers::Shell.new(logger)
 
-#      variables = Minke::Generators::ConfigVariables.new.tap do |v|
-#        v.application_name = @config.application_name
-#        v.namespace = @config.namespace
-#        v.src_root = File.expand_path('../')
-#      end
-      
       task_runner = Minke::Tasks::TaskRunner.new ({
         :ruby_helper       => Minke::Helpers::Ruby.new,
         :copy_helper       => Minke::Helpers::Copy.new,
@@ -51,7 +45,7 @@ module Minke
       return {
         :config                 => @config,
         :task_name              => task,
-        :docker_runner          => Minke::Docker::DockerRunner.new(logger, network_name),
+        :docker_runner          => Minke::Docker::DockerRunner.new(logger, network_name, project_name),
         :task_runner            => task_runner,
         :shell_helper           => shell,
         :logger_helper          => logger,
@@ -110,7 +104,7 @@ module Minke
     end
     
     def build_image
-      if config.test != nil
+      if config.build != nil
         test
         tasks = create_tasks :build
         tasks[:build_image].run

data/lib/minke/config/config.rb

@@ -249,10 +249,10 @@ module Minke
       attr_accessor :docker
 
       ##
-      # container_addresses contains an array of Minke::Config::ContainerAddress which holds the details
+      # ports contains an array of Minke::Config::ContainerAddress which holds the details
       # for the address the public and private ports of any containers which will be started by this
       # task.
-      attr_accessor :container_addresses
+      attr_accessor :ports
     end
 
     ##
@@ -335,5 +335,6 @@ module Minke
       # - private used for linked containers
       attr_accessor :type
     end
+
   end
 end

data/lib/minke/config/reader.rb

@@ -63,6 +63,7 @@ module Minke
           t.docker        = read_docker_section section['docker'] unless section['docker'] == nil
           t.pre           = read_pre_post_section section['pre']  unless section['pre'] == nil
           t.post          = read_pre_post_section section['post'] unless section['post'] == nil
+          t.ports         = section['ports'] unless section['ports'] == nil
         end
       end
 

data/lib/minke/docker/docker_compose.rb

@@ -69,6 +69,10 @@ module Minke
         { 'networks' => {'default' => { 'external' => { 'name' => @docker_network } } } }
       end
 
+      def services 
+        create_compose['services']
+      end
+
       def create_compose
         existing = YAML.load(File.read(@compose_file))
         services = {}

data/lib/minke/docker/docker_runner.rb

@@ -1,9 +1,10 @@
 module Minke
   module Docker
     class DockerRunner
-      def initialize logger, network = nil
+      def initialize logger, network = nil, project = nil
         @network = network ||= 'bridge'
         @logger = logger
+        @project = project
       end
 
       ##
@@ -74,8 +75,8 @@ module Minke
       		'Cmd'             => args[:command],
       		"Binds"           => args[:volumes],
       		"Env"             => args[:environment],
+          'NetworkMode'         => @network,
       		'WorkingDir'      => args[:working_directory],
-          'NetworkMode'     => @network,
           'name'            => args[:name],
           'PublishAllPorts' => true
         )
@@ -106,42 +107,57 @@ module Minke
       	return container, success
       end
       
-      #
-      # create_and_run_blocking_container starts a conatainer of the given image name and executes a command, this method blocks until the container exits
+      ##
+      # create_and_run_blocking_container starts a conatainer of the given image name and executes a command, 
+      # this method blocks until the container exits
       #
       # Returns:
       # - Docker::Container
       # - sucess (true if command succeded without error)
       def create_and_run_blocking_container args
+        host_config = get_port_bindings args
+        host_config['NetworkMode'] = @network
+        host_config['Binds'] = args[:volumes]
+
+        if args[:links] != nil 
+          network = {'EndpointsConfig' => {@network =>
+            {'Links' => args[:links].map {|l| "#{@project}_#{l}_1:#{l}"}}
+          }}
+        end
+
+        exposed_ports = get_exposed_ports args
+
       	# update the timeout for the Excon Http Client
       	# set the chunk size to enable streaming of log files
-        ::Docker.options = {:chunk_size => 1, :read_timeout => 3600}
+        #::Docker.options = {:chunk_size => 1, :read_timeout => 3600}
         container = ::Docker::Container.create(
-      		'Image'           => args[:image],
-      		'Cmd'             => args[:command],
-      		"Binds"           => args[:volumes],
-      		"Env"             => args[:environment],
-      		'WorkingDir'      => args[:working_directory],
-          'name'            => args[:name],
-          'NetworkMode'     => @network,
-          "OpenStdin"       => true,
-          "StdinOnce"       => true,
-          "Tty"             => true,
-          'PublishAllPorts' => true
+      		'Image'            => args[:image],
+      		'Cmd'              => args[:command],
+      		"Binds"            => args[:volumes],
+      		"Env"              => args[:environment],
+      		'WorkingDir'       => args[:working_directory],
+          'name'             => args[:name],
+          'NetworkMode'      => @network,
+          "OpenStdin"        => true,
+          "Tty"              => true,
+          'PublishAllPorts'  => true,
+          'ExposedPorts'     => exposed_ports,
+          'HostConfig'       => host_config,
+          'NetworkingConfig' => network
         )
 
         container.start
       
+        success = (container.json['State']['ExitCode'] == 0) ? true: false 
+        @logger.error("Unable to start docker container") unless success 
+
         STDIN.raw do |stdin|
           container.attach(stdin: stdin, tty: true) do |chunk|
             print chunk
           end
         end
 
-        success = (container.json['State']['ExitCode'] == 0) ? true: false 
-        @logger.error(output) unless success 
-
-      	return container, success
+        return container, success
       end
 
       ##
@@ -152,12 +168,12 @@ module Minke
           ::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
           end
         rescue => e
-          @logger.error e
-          message = /.*{"message":"(.*?)"}/.match(e.to_s)
-          @logger.error "Error: #{message[1]}" unless message == nil || message.length < 1
+          message = e.message
+          @logger.error "Error: #{message}" unless message == nil || message.length < 1
         end
       end
 
@@ -198,6 +214,37 @@ module Minke
       def docker_version
         ::Docker.version['Version']
       end
+
+      def get_port_bindings args
+        host_config = {}
+        if args[:ports] != nil 
+          port_bindings = {}
+          args[:ports].each do |p|
+            hostDest = p.split(":")
+            if hostDest[0] == ""
+              port_bindings[hostDest[1] + "/tcp"] = [{'HostPort' => "#{rand(40000..50000)}", 'HostIp' => "0.0.0.0"}]
+            else 
+              port_bindings[hostDest[1] + "/tcp"] = [{'HostPort' => hostDest[0], 'HostIp' => "0.0.0.0"}]
+            end
+          end
+          host_config = {'PortBindings' => port_bindings }
+        end
+
+        return host_config
+      end
+
+      def get_exposed_ports args
+        port_bindings = {}
+        if args[:ports] != nil 
+          args[:ports].each do |p|
+            hostDest = p.split(":")
+            port_bindings[hostDest[1] + "/tcp"] = {}
+          end
+        end
+
+        return port_bindings
+      end
+
     end
   end
 end

data/lib/minke/docker/network.rb

@@ -4,14 +4,20 @@ module Minke
       def initialize network_name, shell_runner
         @network_name = network_name
         @shell_runner = shell_runner
+        @created_network = false
       end
 
       def create
-        @shell_runner.execute("docker network create #{@network_name}") if find_network.to_s == ''
+        if find_network.to_s == ''
+          @shell_runner.execute("docker network create #{@network_name}") 
+          @created_network = true
+        end
       end
 
       def remove
-        @shell_runner.execute("docker network rm #{@network_name}", true) unless find_network.to_s == ''
+        if find_network.to_s != '' && @created_network == true
+          @shell_runner.execute("docker network rm #{@network_name}", true)
+        end
       end
 
       private 

data/lib/minke/scripts/minke

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

@@ -9,13 +9,15 @@ module Minke
         compose_file = @config.compose_file_for(@task_name)
         compose_file = File.expand_path(compose_file)
         compose = @docker_compose_factory.create compose_file unless compose_file == nil
-        
+
         run_with_block do |pre_tasks, post_tasks|
           begin
+            services = create_list_of_links(compose.services)
             compose.up
             pre_tasks.call
+
             @logger.info "## Shell open to build container"
-            run_command_in_container('/bin/sh', true)
+            run_command_in_container(['/bin/sh','-c','ls && /bin/sh'], true, services, @task_settings.ports)
           rescue SystemExit, Interrupt
             @logger.info "Stopping...."
             raise SystemExit
@@ -26,6 +28,15 @@ module Minke
         end
       end
 
+      def create_list_of_links compose_services
+        services = []
+        compose_services.each do |k,v| 
+          services.push(k) 
+        end
+
+        services
+      end
     end
+
   end
 end

data/lib/minke/tasks/task.rb

@@ -63,7 +63,7 @@ module Minke
 
       ##
       # runs the given command in a docker container
-      def run_command_in_container command, blocking = false
+      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
@@ -78,12 +78,19 @@ module Minke
             environment.push "GIT_SSH_COMMAND=ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
           end
 
+          if @task_settings.consul_loader != nil && links != nil
+            links.push "consul"
+          end
+
+
           args = {
             :image             => build_image,
             :command           => command,
             :volumes           => volumes,
             :environment       => environment,
-            :working_directory => working_directory
+            :working_directory => working_directory,
+            :links             => links,
+            :ports             => ports,
           }
 
           if blocking == false

data/lib/minke/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minke
 version: !ruby/object:Gem::Version
-  version: 1.14.1
+  version: 1.14.2
 platform: ruby
 authors:
 - Nic Jackson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-02 00:00:00.000000000 Z
+date: 2017-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler