minke 1.8.0 → 1.8.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmRhZmY1MDljOWIyNjkxOWU0Y2NhYTg5MTdmZjI5ZGFjNDdjYWM5Yg==
+    MzMzMTRjZjYyYjg4NjViMzQzNWQ0NjNiMWRiMjhkNzlhMjQ5MTYxMg==
   data.tar.gz: !binary |-
-    ODVkMWRmODEzYWZhZmYwY2FlODFiMTY2MTIzYzNmMjI4OTI5M2M1ZQ==
+    ODFlM2Q5ZTNiYWU3NWQwMTJiNWM5NTgxOWI3YWVkNjVkZjE2YzcxMg==
 SHA512:
   metadata.gz: !binary |-
-    YzBiNmE2YjA3ZDRhMjY1NjYzM2M4MzJkYmI4NjZlZTNjZDBlODZlMTNiMTEw
-    ZTQyNmMxYmJjNzhiODFkNzhmZTBmNTBlMjQwNjQyNGMwYzNlNDJhNDM5ODE2
-    ZmYzMDZhYTM0NzBhMGQ4NmU0NGE0NDIxZjg2OWJlMDg1OTE5ZGY=
+    NWEzYmRlZjE1Y2Q4MWQ4NDNmYWUxYzZhY2I3MjM2NDVhNWE3ODE2ZjMzNzFh
+    NGJmNGRiMDcxY2FkOTg3MmYwNDhlOGZiMDE3MjU2MTgxOWU0NTEzNTdlMmFl
+    MzE5ODFkOTVjZjQ5MzNkZjA5ZWE2ZjU4N2NmOTY3Zjk4ZTU0OGI=
   data.tar.gz: !binary |-
-    M2UyMWYwMzNiYzI2NzFhMjQ5ZjVjYTgxNzFjNWI1Y2E4ZTE0MDMwMTFkNzQw
-    ZjZlYmM1ZjU0MTU2NzcwYThkZmFlYjA4MjI0YzJjOTM4NjJkYWE0NzFiZTc1
-    MGVjYmM2OGE3MTY1MjVkMWY5MmY1ZjhkNmViMTQyZmFkNzVlZTI=
+    MjcyYTY2NjJlMTY4ZDRjNTMwZmU2NTdlODdhZDgyYzkxOTViYzExYmU4MDY1
+    OWZjY2JhZjZlY2M5MDM5ZmM0YjVmMWQ2NWZiOWFmM2ZlMDFlNTFiNjNjYzBk
+    NDk1ZWVmZGRlYTY1MGQ1NmUzZTNiZWY3OGQyMjFjN2E3MTM0MDM=

data/docker/Dockerfile

@@ -1,4 +1,13 @@
 FROM ruby:latest
 
+ENV COMPOSE_VERSION 1.7.1
+ENV MACHINE_VERSION 0.7.0
+
+RUN apt-get update -q \
+	&& apt-get install -y -q --no-install-recommends curl ca-certificates \
+	&& curl -o /usr/local/bin/docker-compose -L \
+		"https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}/docker-compose-Linux-x86_64" \
+	&& chmod +x /usr/local/bin/docker-compose
+
 COPY ./Gemfile Gemfile
 RUN bundle install

data/lib/minke/docker/service_discovery.rb

@@ -32,15 +32,15 @@ module Minke
       # Will attempt to locate the private details for a running container given
       # its name and private port
       # Parameters:
+      # - network: the name of the network the container is running on
       # - 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
+      def bridge_address_for network, 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']
+          ip = container_details.first.info['NetworkSettings']['Networks']["#{network}"]['IPAddress']
         rescue
           raise "Unable to find bridge address for '#{service_name}' on port #{private_port}"
         end

data/lib/minke/rake/app.rake

@@ -72,7 +72,7 @@ namespace :app do
   end
 
   def create_dependencies
-    @project_name = "minke#{SecureRandom.urlsafe_base64(12)}".downcase
+    @project_name = "minke#{SecureRandom.urlsafe_base64(12)}".downcase.gsub('-', '')
     @system_runner = Minke::Docker::SystemRunner.new
     @docker_compose_factory ||= Minke::Docker::DockerComposeFactory.new @system_runner, @project_name
     @docker_runner ||= Minke::Docker::DockerRunner.new

data/lib/minke/tasks/task.rb

@@ -88,7 +88,7 @@ module Minke
         if url.type == 'external'
           "#{url.protocol}://#{url.address}:#{url.port}#{url.path}"
         elsif url.type == 'bridge'
-          address = @service_discovery.bridge_address_for url.address, url.port
+          address = @service_discovery.bridge_address_for ENV['DOCKER_NETWORK'], url.address, url.port
           "#{url.protocol}://#{address}#{url.path}"
         elsif url.type == 'public'
           address = @service_discovery.public_address_for url.address, url.port

data/lib/minke/version.rb

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

metadata

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