minke 1.6.1 → 1.8.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWIxZmFjODdiYTgyYzBmOTg2Yjg3Nzg4Y2RlZjRkZmM0MGZkNjk5NQ==
+    YmRhZmY1MDljOWIyNjkxOWU0Y2NhYTg5MTdmZjI5ZGFjNDdjYWM5Yg==
   data.tar.gz: !binary |-
-    MzQ4YzhmMjFmZDg1N2Y4MmFiZDk2ZTA1ZjRkMzkxOGFiNTg4OTMxMQ==
+    ODVkMWRmODEzYWZhZmYwY2FlODFiMTY2MTIzYzNmMjI4OTI5M2M1ZQ==
 SHA512:
   metadata.gz: !binary |-
-    Y2IwYTI2YjI0MDhmZDcwYTUzOTBmYmY1OTQ2MzBmZWEyNTFiNTBkMGM3Yzhm
-    NjE5OTFkNzY5MmUzZTM3Njc3Mjc2NzU0NjM5OTY2NmVkNzUxYjM5MThkNTZh
-    MjA3MTE3MzViZGRjNjE2ZGE1MzMyOGI1YzU1MDkzYmM2ZTIyNzE=
+    YzBiNmE2YjA3ZDRhMjY1NjYzM2M4MzJkYmI4NjZlZTNjZDBlODZlMTNiMTEw
+    ZTQyNmMxYmJjNzhiODFkNzhmZTBmNTBlMjQwNjQyNGMwYzNlNDJhNDM5ODE2
+    ZmYzMDZhYTM0NzBhMGQ4NmU0NGE0NDIxZjg2OWJlMDg1OTE5ZGY=
   data.tar.gz: !binary |-
-    ZjgyNjA0N2I3YWI0M2E0YTVmNTBlZjU2MTU3YmZjYzRiNjk1MWFkOWQxZmYw
-    NWRkOGE0NmMyNDU0NTEyZTgxNjcyYjVhNzAyNjBkZWUyZmUzZTE0MGRhZDg3
-    N2MyYTU2ZTE2NzY0MDVjYmRhMjIxMTAwOTRlODE3MGZiMWQ1Yjg=
+    M2UyMWYwMzNiYzI2NzFhMjQ5ZjVjYTgxNzFjNWI1Y2E4ZTE0MDMwMTFkNzQw
+    ZjZlYmM1ZjU0MTU2NzcwYThkZmFlYjA4MjI0YzJjOTM4NjJkYWE0NzFiZTc1
+    MGVjYmM2OGE3MTY1MjVkMWY5MmY1ZjhkNmViMTQyZmFkNzVlZTI=

data/docker/Dockerfile

@@ -0,0 +1,4 @@
+FROM ruby:latest
+
+COPY ./Gemfile Gemfile
+RUN bundle install

data/docker/Gemfile

@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+gem "rake"
+gem "cucumber", "~> 1.3.10"
+gem "cucumber-rest-api", "= 0.3"
+gem 'minke'
+gem 'minke-generator-swift'
+gem 'minke-generator-netmvc'
+gem 'minke-generator-go'

data/lib/minke.rb

@@ -12,6 +12,7 @@ require 'colorize'
 require 'multi_json'
 require 'openssl'
 require 'base64'
+require 'securerandom'
 require 'sshkey'
 
 require 'minke/version'

data/lib/minke/docker/docker_compose.rb

@@ -1,19 +1,21 @@
 module Minke
   module Docker
     class DockerComposeFactory
-      def initialize system_runner
+      def initialize system_runner, project_name
+        @project_name = project_name
         @system_runner = system_runner
       end
 
       def create compose_file
-        Minke::Docker::DockerCompose.new compose_file, @system_runner
+        Minke::Docker::DockerCompose.new compose_file, @system_runner, @project_name
       end
     end
 
     class DockerCompose
       @compose_file = nil
 
-      def initialize compose_file, system_runner
+      def initialize compose_file, system_runner, project_name
+        @project_name = project_name
         @compose_file = compose_file
         @system_runner = system_runner
       end
@@ -21,41 +23,26 @@ module Minke
       ##
       # start the containers in a stack defined by the docker compose file
       def up
-        unless ENV['DOCKER_NETWORK'].to_s.empty?
-          directory = create_compose_network_file
-
-          @system_runner.execute "docker-compose -f #{@compose_file} -f #{directory + '/docker-compose.yml'} up -d"
-          @system_runner.remove_entry_secure directory
-        else
-          @system_runner.execute "docker-compose -f #{@compose_file} up -d"
-        end
-
+        execute_command "up -d"
         sleep 2
       end
 
       ##
       # stop the containers in a stack and removes them as defined by the docker compose file
       def down
-        unless ENV['DOCKER_NETWORK'].to_s.empty?
-          directory = create_compose_network_file
-
-          @system_runner.execute "docker-compose -f #{@compose_file} -f #{directory + '/docker-compose.yml'} down"
-          @system_runner.remove_entry_secure directory
-        else
-          @system_runner.execute "docker-compose -f #{@compose_file} down -v"
-        end
+        execute_command "down -v"
       end
 
       ##
       # remove the containers started in a stack defined by the docker compose file
       def rm
-        @system_runner.execute "echo y | docker-compose -f #{@compose_file} rm -v" unless ::Docker.info["Driver"] == "btrfs"
+        execute_command 'rm -v' unless ::Docker.info["Driver"] == "btrfs"
       end
 
       ##
       # stream the logs for the current running stack
       def logs
-        @system_runner.execute "docker-compose -f #{@compose_file} logs -f"
+        execute_command 'logs -f'
       end
 
       ##
@@ -64,6 +51,17 @@ module Minke
         @system_runner.execute_and_return "docker-compose -f #{@compose_file} port #{container} #{private_port}"
       end
 
+      def execute_command command
+        unless ENV['DOCKER_NETWORK'].to_s.empty?
+          directory = create_compose_network_file
+
+          @system_runner.execute "docker-compose -f #{@compose_file} -f #{directory + '/docker-compose.yml'} -p #{@project_name} #{command}"
+          @system_runner.remove_entry_secure directory
+        else
+          @system_runner.execute "docker-compose -f #{@compose_file} -p #{@project_name} #{command}"
+        end
+      end
+
       def create_compose_network_file
         content = { 'version' => '2'.to_s, 'networks' => {'default' => { 'external' => { 'name' => ENV['DOCKER_NETWORK'] } } } }
 

data/lib/minke/docker/docker_runner.rb

@@ -42,6 +42,16 @@ module Minke
         ::Docker::Image.create('fromImage' => image_name)
       end
 
+      ##
+      # running_images returns a list of running containers
+      # Returns
+      #
+      # Array of Docker::Image
+      def running_containers
+        containers = ::Docker::Container.all(all: true, filters: { status: ["running"] }.to_json)
+        return containers
+      end
+
       ##
       # create_and_run_container starts a conatainer of the given image name and executes a command
       #

data/lib/minke/docker/service_discovery.rb

@@ -3,30 +3,54 @@ module Minke
     ##
     # ServiceDiscovery allows you to look up the publicly accessible address and port for a server
     class ServiceDiscovery
-      def initialize config
-        reader = Minke::Config::Reader.new
-        @config = reader.read config
+      def initialize project_name, docker_runner
+        @project_name = project_name
+        @docker_runner = docker_runner
       end
 
       ##
       # Will attempt to locate the public details for a running container given
       # its name and private port
       # Parameters:
-      # - container_name: the name of the running container
+      # - service_name: the name of the running service
       # - private_port: the private port which you wish to retrieve an address for
-      # - task: :run, :cucumber search either the run or cucumber section of the config
-      def public_address_for container_name, private_port, task
-        compose = Minke::Docker::DockerCompose.new @config.compose_file_for(task), Minke::Docker::SystemRunner.new
-        docker_runner = Minke::Docker::DockerRunner.new
+      # Returns:
+      # public address for the container e.g. 0.0.0.0:8080
+      def public_address_for service_name, private_port
+        begin
+          ip = @docker_runner.get_docker_ip_address
+          container_details = find_container_by_name "/#{@project_name}_#{service_name}_1"
+          ports = container_details.first.info['Ports'].select { |p| p['PrivatePort'] == private_port }.first
+        rescue
+          raise "Unable to find public address for '#{service_name}' on port #{private_port}"
+        end
 
-        public_address = compose.public_address container_name, private_port
+        return "#{ip}:#{ports['PublicPort']}"
+      end
 
-        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)
+      ##
+      # Will attempt to locate the private details for a running container given
+      # its name and private port
+      # Parameters:
+      # - service_name: the name of the running service
+      # - private_port: the private port which you wish to retrieve an address for
+      # Returns:
+      # private address for the container e.g. 172.17.0.2:8080
+      def bridge_address_for service_name, private_port
+        begin
+          puts "/#{@project_name}_#{service_name}_1"
+          container_details = find_container_by_name "/#{@project_name}_#{service_name}_1"
+          ip = container_details.first.info['NetworkSettings']['Networks']['bridge']['IPAddress']
+        rescue
+          raise "Unable to find bridge address for '#{service_name}' on port #{private_port}"
         end
+        return "#{ip}:#{private_port}"
+      end
 
-        public_address
+      :private
+      def find_container_by_name name
+        containers = @docker_runner.running_containers
+        containers.select { |c| c.info['Names'].include?(name) }
       end
     end
   end

data/lib/minke/rake/app.rake

@@ -46,7 +46,7 @@ namespace :app do
     create_dependencies
 
     if @config.run != nil
-      runner = Minke::Tasks::Run.new @config, :run, @generator_config, @docker_runner, @docker_compose_factory, @logger, @helper
+      runner = Minke::Tasks::Run.new @config, :run, @generator_config, @docker_runner, @docker_compose_factory, @service_discovery, @logger, @helper
       runner.run
     end
   end
@@ -59,7 +59,7 @@ namespace :app do
     create_dependencies
 
     if @config.cucumber != nil
-      runner = Minke::Tasks::Cucumber.new @config, :cucumber, @generator_config, @docker_runner, @docker_compose_factory, @logger, @helper
+      runner = Minke::Tasks::Cucumber.new @config, :cucumber, @generator_config, @docker_runner, @docker_compose_factory, @service_discovery, @logger, @helper
       runner.run
     end
   end
@@ -72,9 +72,11 @@ namespace :app do
   end
 
   def create_dependencies
+    @project_name = "minke#{SecureRandom.urlsafe_base64(12)}".downcase
     @system_runner = Minke::Docker::SystemRunner.new
-    @docker_compose_factory ||= Minke::Docker::DockerComposeFactory.new @system_runner
+    @docker_compose_factory ||= Minke::Docker::DockerComposeFactory.new @system_runner, @project_name
     @docker_runner ||= Minke::Docker::DockerRunner.new
+    @service_discovery ||= Minke::Docker::ServiceDiscovery.new @project_name, @docker_runner
 
     if @config == nil
       reader = Minke::Config::Reader.new

data/lib/minke/tasks/task.rb

@@ -4,11 +4,12 @@ module Minke
     # Task is a base implementation of a rake task such as fetch, build, etc
     class Task
 
-      def initialize config, task, generator_settings, docker_runner, docker_compose_factory, logger, helper
+      def initialize config, task, generator_settings, docker_runner, docker_compose_factory, service_discovery, logger, helper
         @config = config
         @task = task
         @generator_settings = generator_settings
         @docker_runner = docker_runner
+        @service_discovery = service_discovery
         @logger = logger
         @helper = helper
         @task_settings = config.send(task)
@@ -84,18 +85,21 @@ module Minke
       end
 
       def build_address url
-        if url.type == 'public'
+        if url.type == 'external'
           "#{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
+        elsif url.type == 'bridge'
+          address = @service_discovery.bridge_address_for url.address, url.port
+          "#{url.protocol}://#{address}#{url.path}"
+        elsif url.type == 'public'
+          address = @service_discovery.public_address_for url.address, url.port
 
+          # if running on docker for mac we need to replace the ip address with the docker hosts
           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)
+            address.gsub!('0.0.0.0', ip)
           end
 
-          "#{url.protocol}://#{public_address}#{url.path}"
+          "#{url.protocol}://#{address}#{url.path}"
         end
       end
 

data/lib/minke/version.rb

@@ -1,3 +1,3 @@
 module Minke
-  VERSION = "1.6.1"
+  VERSION = "1.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minke
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Nic Jackson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -201,6 +201,8 @@ files:
 - bin/console
 - bin/minke
 - bin/setup
+- docker/Dockerfile
+- docker/Gemfile
 - examples/config_go.yml
 - examples/config_swift.yml
 - lib/minke.rb