minke in minke-1.13.9

- old
+ new

@@ -1,32 +1,29 @@
 #!/bin/bash
-MINKE_VERSION="1.13.7"
+MINKE_VERSION="1.13.9"
 
 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="minketester"
+DOCKER_IMAGE="nicholasjackson/minke:${MINKE_VERSION}"
 
 COMMAND=$*
 
 GEM_VOLUMES=""
 
 # Test if interactive terminal and set the flag
 [[ -t 1 ]] && IT="-it" || IT=""
 
 if [[ $1 != \generate* ]]; then
-
-  echo "Generate"
-
   # Test if we need to mount any special volumes for paths specified in the Gemfile
   while read -r line; do
     l=$(echo $line | sed "s/.*:path *=> *//" | sed "s/['|\"]\(.*\)['|\"]/\1/")
     GEM_VOLUMES="${GEM_VOLUMES} -v $l:$l"
   done < <(grep :path Gemfile)
 
   DIR=$(dirname `pwd`)
-  DOCKER_RUN="docker run --rm ${IT} --net=minke_${NEW_UUID} ${GEM_VOLUMES} -v ${DOCKER_SOCK} -v ${DIR}:${DIR} -v ${DIR}/_build/vendor:/usr/local/bundle -e DOCKER_NETWORK=minke_${NEW_UUID} -w ${DIR}/_build ${DOCKER_IMAGE} ${COMMAND}"
+  DOCKER_RUN="docker run --rm --net=minke_${NEW_UUID} ${GEM_VOLUMES} -v ${DOCKER_SOCK} -v ${DIR}:${DIR} -v ${DIR}/_build/vendor:/usr/local/bundle -e DOCKER_NETWORK=minke_${NEW_UUID} -w ${DIR}/_build ${DOCKER_IMAGE} ${COMMAND}"
 
   echo "Running command: minke ${COMMAND}"
 
   id=$(docker network create minke_${NEW_UUID})
   #echo "${DOCKER_RUN}"
@@ -34,9 +31,9 @@
   id=$(docker network rm minke_${NEW_UUID})
 fi
 
 if [[ $1 = \generate* ]]; then
   DIR=$(pwd)
-  DOCKER_RUN="docker run --rm ${IT} -v ${DOCKER_SOCK} -v ${DIR}:${DIR} -w ${DIR}/${DIR} ${DOCKER_IMAGE} ${COMMAND}"
+  DOCKER_RUN="docker run --rm -v ${DOCKER_SOCK} -v ${DIR}:${DIR} -w ${DIR}:${DIR} ${DOCKER_IMAGE} ${COMMAND}"
   echo $DOCKER_RUN 
   eval "$DOCKER_RUN"
 fi