minke 1.12.8 → 1.12.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmJmNTU5NzEzMDY5YmRiNWMwMDEwOWIxYWM5MjIxNDIzNDM4OTFmMQ==
+    ZTRmZWM3NzViM2YzNWYzNDQ3MjEzM2M4NTZmYWIwNDRlYjQyMmVkYg==
   data.tar.gz: !binary |-
-    NjEyOTJkYTZkMDQ5MmY0ZjY4ODJmMTExYzkxMzZmNTEwNTlhOWE3NQ==
+    ZjY5ZmI1OWVjNDVhNjAzN2ZlMzE1MjExYWMwMDQ3ZWUwMGE4NjI3NA==
 SHA512:
   metadata.gz: !binary |-
-    NTkyNTFiZmZlZmZjYjJmMGI0MzVjZjQ3M2IyZjMwM2YzY2U5MjFhY2ZiNmRl
-    MTRiYmVlZTBhOWY2YTUxMTFjYTUzN2VhN2EyYWQ3YzBlOTVmOGNjMTZhOWI4
-    MTE0NGMwNWNiNTllMmNjMmY1ODZjNzJjNDNiYzAxMmU4ZGU3Njc=
+    N2JkMzRjZWE0OWE5Yjg5OTJjOGExZDgwODQ0ZWI3MGI4ZThkMTEwYjE5Nzk3
+    MmI2MjNiODdkZWJlMmViZmZkMmFjMGQxYmM1NjU3YmJlN2FkODZhZjBiMGMw
+    NGQzMTAxZDVkZjE0MTI4N2IyMDIzMjM4N2MxYzg0NjAxZDljMmQ=
   data.tar.gz: !binary |-
-    Mjk1NjU1Yzc4OWMzNTg4OWNjNzgxMzg2ZDNlZjlkZjNkNmIzOGUyNzA0NDYz
-    YmY0ODRkOTdmYmI5MDU2MzZhYTQ1ODRlMDg4MTQwNTIzMjVmNDE3OTEzNjNh
-    OGU2MTk1MjljY2ZmY2FiNTUzZDcwNDdmZTc0ZDI0ZTg2ZmQ5ZTU=
+    N2RkMTE2M2YyNGNjNDdhYWIwYzI0MjQxZjk0NzljMzM1ZTJjODQzMDZlOTE4
+    ZDVhMmZjN2Q2MzU4MjBjM2NkZWMxNTY2YzViZDk5NDUxNjczMzA1OWE1YTg0
+    MDVlM2EwYTBiZGNhZTk5NWI3NTlkZTEzN2Y3YWI1YTZlNTgxZDk=

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

data/docker/Dockerfile

@@ -23,7 +23,7 @@ RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 581
 RUN echo "deb https://apt.dockerproject.org/repo debian-jessie main" > /etc/apt/sources.list.d/docker.list
 
 RUN apt-get update
-RUN apt-get -y install docker-engine
+RUN apt-get -y install docker-engine=1.10.3-0~jessie
 
 RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 && curl -L get.rvm.io | bash -s stable --ruby=2.3.1 --with-gems="bundle"
 

data/lib/minke/docker/docker_compose.rb

@@ -54,14 +54,15 @@ module Minke
           hash.merge!(create_compose_network)
         end
 
-        directory = @system_runner.mktmpdir
-        temp_file = directory + '/docker-compose.yml'
+        directory = File.dirname(@compose_file)
+
+        temp_file = directory + '/tmp_docker-compose.yml'
         @system_runner.write_file temp_file, YAML.dump(hash)
 
         ex = "docker-compose -f #{temp_file} -p #{@project_name} #{command}"
 
         @system_runner.execute ex
-        @system_runner.remove_entry_secure directory
+        @system_runner.remove_entry_secure temp_file
       end
 
       def create_compose_network

data/lib/minke/scripts/minke.sh

@@ -1,15 +1,19 @@
 #!/bin/bash
-MINKE_VERSION="1.12.8"
+MINKE_VERSION="1.12.9"
 ERROR="Please specify a command e.g. ./minke.sh rake app:test"
 
 DOCKER_SOCK="/var/run/docker.sock:/var/run/docker.sock"
 NEW_UUID=$(base64 /dev/urandom | tr -d '/+' | head -c 32 | tr '[:upper:]' '[:lower:]')
 
-GEMSET=$(<.ruby-gemset)
-LEN=$(echo ${#GEMSET})
+GEMSET='minkegems'
 
-if [ $LEN -lt 1 ]; then
-  GEMSET='minkegems'
+if [ -f ".ruby-gemset" ]; then
+  GEMSET=$(<.ruby-gemset)
+  LEN=$(echo ${#GEMSET})
+  
+  if [ $LEN -lt 1 ]; then
+    GEMSET='minkegems'
+  fi
 fi
 
 GEMSETFOLDER="/usr/local/rvm/gems/ruby-2.3.1@${GEMSET}"

data/lib/minke/version.rb

@@ -1,3 +1,3 @@
 module Minke
-  VERSION = "1.12.8"
+  VERSION = "1.12.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minke
 version: !ruby/object:Gem::Version
-  version: 1.12.8
+  version: 1.12.9
 platform: ruby
 authors:
 - Nic Jackson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-26 00:00:00.000000000 Z
+date: 2016-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -218,7 +218,6 @@ files:
 - docker/.bashrc
 - docker/Dockerfile
 - docker/Gemfile
-- docker/minke.gem
 - examples/config_go.yml
 - examples/config_swift.yml
 - lib/minke.rb