minke 1.13.18 → 1.13.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37f21bb55040f8575e3f678af26ec5f622bd6158
-  data.tar.gz: a467dc8c47cb96fb4a8c90c332e1e271845648d8
+  metadata.gz: db5c87cfe8c45388d9219ed6df1533ddede1ea85
+  data.tar.gz: 4df5df6ff06439bbdadd40cb65111a4aacfaed5a
 SHA512:
-  metadata.gz: 6567b76c4342cb898cf5b7111af987c86419be86f6ca1240d6f96fb2041a8a46a5c8b8f23716f12cfe2ec2fb6598666bab7ff43af3047abe9b61997ff77fe8c0
-  data.tar.gz: d819a2df102d12f1647bf6c1b4b0cd98785575cff6f64c3f6abe6a5c01c703646838ad48f6bde16d7804071740597559bce5c012299d8084189c83ede524c599
+  metadata.gz: 09c308d7681d4f510db4a3a6511e825848e160379a3cc0857d07a3d959081bc98e0b6a7fd25fbc82fbae3a7f3dcfd7f07f2d3ad151e7b41262f4d83ce8455be7
+  data.tar.gz: 25de6501558149029163480c0c4815d38f3324afce9de60e282c8ad1f05cc9f96560514cbe77c8d5866a1bbea619fed956c96a68f5dff3b8b40d80bae80bc7f8

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

data/bin/minke

@@ -45,6 +45,7 @@ HELP
 global = OptionParser.new do |opts|
   opts.banner = "Usage: minke [options] [subcommand [options]]"
   opts.on("-v", "--[no-]verbose", "Run verbosely") { |v| options[:verbose] = true }
+  opts.on("-A", "--forward-ssh", "Forward ssh keys to docker") { |v| options[:forward_ssh] = true }
   opts.separator ""
   opts.separator subtext
 end

data/docker/Dockerfile

@@ -35,6 +35,7 @@ RUN chmod +x /entrypoint.sh
 
 RUN gem update --system
 RUN gem install bundler -v 1.13.6
+RUN bundle config build.nokogiri --use-system-libraries
 RUN bundle install
 
 RUN mkdir /usr/local/backup

data/lib/minke/scripts/minke

@@ -1,14 +1,29 @@
 #!/bin/bash
-MINKE_VERSION="1.13.18"
+MINKE_VERSION="1.13.19"
 
 DOCKER_SOCK="/var/run/docker.sock:/var/run/docker.sock"
 NEW_UUID=$(base64 /dev/urandom | tr -d '/+' | head -c 32 | tr '[:upper:]' '[:lower:]')
-
 DOCKER_IMAGE="nicholasjackson/minke:${MINKE_VERSION}"
-
 COMMAND=$*
-
 GEM_VOLUMES=""
+SSH_AUTH=""
+
+# Forward keys to docker host
+if [[ $1 == "-A" || $2 == "-A" ]]; then
+  if [[ "${DOCKER_MACHINE}" != "" ]]; then
+    # for docker machine
+    SSH_SOCK=boot2docker.$$.ssh.socket
+    docker-machine ssh ${DOCKER_MACHINE} -A -S $SSH_SOCK -M -f -n tail -f /dev/null
+    AGENT_SOCK=$(docker-machine ssh ${DOCKER_MACHINE} -S $SSH_SOCK echo \$SSH_AUTH_SOCK)
+    SSH_AUTH="-e AGENT_SOCK=${AGENT_SOCK}"
+  fi
+
+  if [[ "${DOCKER_MACHINE}" == "" ]]; then
+    SSH_AUTH="-e AGENT_SOCK=${SSH_AUTH_SOCK}"
+  fi
+  
+  echo "Forwarding SSH Keys: ${SSH_AUTH}"
+fi
 
 # Test if interactive terminal and set the flag
 [[ -t 1 ]] && IT="-it" || IT=""
@@ -16,26 +31,28 @@ GEM_VOLUMES=""
 if [[ $1 != \generate* ]]; then
   # Test if we need to mount any special volumes for paths specified in the Gemfile
   while read -r line; do
-    if [[ $line != \#* ]]; then
-      l=$(echo $line | sed "s/.*:path *=> *//" | sed "s/['|\"]\(.*\)['|\"]/\1/")
-      GEM_VOLUMES="${GEM_VOLUMES} -v $l:$l"
-    fi
+		if [[ $line != \#* ]]; then
+			l=$(echo $line | sed "s/.*:path *=> *//" | sed "s/['|\"]\(.*\)['|\"]/\1/")
+ 			GEM_VOLUMES="${GEM_VOLUMES} -v $l:$l"
+		fi
   done < <(grep :path Gemfile)
 
   DIR=$(dirname `pwd`)
-  DOCKER_RUN="docker run ${IT} --rm --net=minke_${NEW_UUID} ${GEM_VOLUMES} -v ${DOCKER_SOCK} -v ${DIR}:${DIR} -e BUNDLE_PATH=${PWD}/vendor -e BUNDLE_JOBS=2 -e DOCKER_NETWORK=minke_${NEW_UUID} -w ${DIR}/_build ${DOCKER_IMAGE} ${COMMAND}"
+  DOCKER_RUN="docker run ${IT} --rm --net=minke_${NEW_UUID} ${SSH_AUTH} ${GEM_VOLUMES} -v ${DOCKER_SOCK} -v ${DIR}:${DIR} -e BUNDLE_PATH=${PWD}/vendor -e BUNDLE_JOBS=2 -e DOCKER_NETWORK=minke_${NEW_UUID} -w ${DIR}/_minke ${DOCKER_IMAGE} ${COMMAND}"
 
   echo "Running command: minke ${COMMAND}"
-
   id=$(docker network create minke_${NEW_UUID})
-  #echo "${DOCKER_RUN}"
   eval "${DOCKER_RUN}"
   id=$(docker network rm minke_${NEW_UUID})
+  
+  if [[ "${DOCKER_MACHINE}" != "" ]]; then
+    # Clean up socket
+    docker-machine ssh default -S $SSH_SOCK -O exit
+  fi
 fi
 
 if [[ $1 = \generate* ]]; then
   DIR=$(pwd)
   DOCKER_RUN="docker run --rm -v ${DOCKER_SOCK} -v ${DIR}:${DIR} -w ${DIR}:${DIR} ${DOCKER_IMAGE} ${COMMAND}"
-  echo $DOCKER_RUN 
   eval "$DOCKER_RUN"
 fi

data/lib/minke/tasks/task.rb

@@ -66,16 +66,23 @@ module Minke
       def run_command_in_container command
         begin
           @logger.info "Running command: #{command}"
-
-          settings          = @generator_config.build_settings.docker_settings
+          settings = @generator_config.build_settings.docker_settings
+          volumes           = settings.binds.clone unless settings.binds == nil
+          environment       = settings.env.clone unless settings.env == nil
           build_image       = create_container_image
           working_directory = create_working_directory
 
+          if ENV['AGENT_SOCK'] != nil
+            volumes.push "#{ENV['AGENT_SOCK']}:/ssh-agent"
+            environment.push "SSH_AUTH_SOCK=/ssh-agent"
+            environment.push "GIT_SSH_COMMAND=ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
+          end
+
           args = {
             :image             => build_image,
             :command           => command,
-            :volumes           => settings.binds,
-            :environment       => settings.env,
+            :volumes           => volumes,
+            :environment       => environment,
             :working_directory => working_directory
           }
           container, success = @docker_runner.create_and_run_container args

data/lib/minke/version.rb

@@ -1,3 +1,3 @@
 module Minke
-  VERSION = "1.13.18"
+  VERSION = "1.13.19"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minke
 version: !ruby/object:Gem::Version
-  version: 1.13.18
+  version: 1.13.19
 platform: ruby
 authors:
 - Nic Jackson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-29 00:00:00.000000000 Z
+date: 2016-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler