Merge pull request #78 from tutumcloud/staging

v0.21.0

Author: fermayo

Dockerfile

@@ -4,7 +4,7 @@ MAINTAINER [email protected]
 RUN apt-get update && \
 	DEBIAN_FRONTEND=noninteractive apt-get install -yq iptables apt-transport-https ca-certificates ssh git curl make
 
-ENV DIND_COMMIT=b8bed8832b77a478360ae946a69dab5e922b194e DOCKER_VERSION=1.8.3 COMPOSE_VERSION=1.3.3
+ENV DIND_COMMIT=b8bed8832b77a478360ae946a69dab5e922b194e DOCKER_VERSION=1.9.1 COMPOSE_VERSION=1.5.2
 ADD https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION} /usr/bin/docker
 ADD https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind /usr/local/bin/dind
 ADD https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}/docker-compose-linux-x86_64 /usr/local/bin/docker-compose

README.md

@@ -123,4 +123,4 @@ If you want to use the host docker daemon instead of letting the container run i
 
 ## Disable recursive strategy on git clone
 
-In some cases, you may need set up credentials for the initialization github submodules, and it may make `git clone --recursive` fail. In such a case, you can disable the default `--recuresive` strategy by setting `-e GIT_CLONE_OPTS=""` and do `git submodule init & git submodule update` manually in `hooks/post_checkout` or `hooks/pre_build`.
+In some cases, you may need set up credentials for the initialization github submodules, and it may make `git clone --recursive` fail. In such a case, you can disable the default `--recursive` strategy by setting `-e GIT_CLONE_OPTS=""` and do `git submodule init & git submodule update` manually in `hooks/post_checkout` or `hooks/pre_build`.

build.sh

@@ -55,11 +55,15 @@ print_msg "=> Detecting application"
 if [ ! -d /app ]; then
 	if [ ! -z "$GIT_REPO" ]; then
 		if [ ! -z "$GIT_ID_RSA" ]; then
-			echo -e "$GIT_ID_RSA" > /root/.ssh/id_rsa
+			echo -e "$GIT_ID_RSA" > ~/.ssh/id_rsa
 			chmod 400 ~/.ssh/id_rsa
 		fi
 		print_msg "   Cloning repo from ${GIT_REPO##*@}"
 		git clone ${GIT_CLONE_OPTS} $GIT_REPO /src
+		if [ ! -z "$GIT_ID_RSA" ]; then
+			rm -f ~/.ssh/id_rsa
+			unset GIT_ID_RSA
+		fi
 		if [ $? -ne 0 ]; then
 			print_msg "   ERROR: Error cloning $GIT_REPO"
 			exit 1
@@ -94,7 +98,6 @@ if [ ! -f Dockerfile ]; then
 	echo "FROM tutum/buildstep" >> Dockerfile
 fi
 
-
 #
 # (1/3) Build step
 #
@@ -167,7 +170,15 @@ if [ ! -z "$IMAGE_NAME" ]; then
 			run_hook push
 		else
 			docker tag -f this $IMAGE_NAME
-			docker push $IMAGE_NAME
+			RETRIES=${RETRIES:-5}
+			for (( i=0 ; ; i++ )); do
+				if [ ${i} -eq ${RETRIES} ]; then
+					echo "Too many retries: failed to push the image ${IMAGE_NAME}"
+					exit 1
+				fi
+				docker push $IMAGE_NAME && break
+				sleep 1
+			done
 			# docker push $IMAGE_NAME 2>&1 | tee /tmp/push-result || true
 			# while cat /tmp/push-result | grep -q "is already in progress"; do
 			#  	 docker push $IMAGE_NAME 2>&1 | tee /tmp/push-result || true
@@ -198,7 +209,7 @@ cat <<EOF
 Build summary
 =============
 
-$DOCKER_USED
+$DOCKER_USED and docker-compose ${COMPOSE_VERSION}
 $SOURCE
 $BUILD
 $TEST

run.sh

@@ -56,19 +56,19 @@ if [ -S /var/run/docker.sock ]; then
 	if ! docker version > /dev/null 2>&1 ; then
 		export DOCKER_VERSION=$(cat version_list | grep -P "^$(docker version 2>&1 > /dev/null | grep -iF "client and server don't have same version" | grep -oP 'server: *\d*\.\d*' | grep -oP '\d*\.\d*') .*$" | cut -d " " -f2)
 		if [ "${DOCKER_VERSION}" != "" ]; then
-			print_msg "=> Downloading Docker ${DOCKER_VERSION}"
+			print_msg "=> Downloading docker ${DOCKER_VERSION}"
 			curl -o /usr/bin/docker https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}
 		fi
 	fi
 	docker version > /dev/null 2>&1 || { print_msg "   Failed to connect to docker daemon at /var/run/docker.sock" && exit 1; }
 	EXTERNAL_DOCKER=yes
-	DOCKER_USED="Using external docker version ${DOCKER_VERSION} mounted at /var/run/docker.sock"
+	DOCKER_USED="Using external docker ${DOCKER_VERSION} mounted at /var/run/docker.sock"
     export DOCKER_USED=${DOCKER_USED}
     export EXTERNAL_DOCKER=${EXTERNAL_DOCKER}
     export MOUNTED_DOCKER_FOLDER=${MOUNTED_DOCKER_FOLDER}
     /build.sh "$@"
 else
-	DOCKER_USED="Using docker-in-docker"
+	DOCKER_USED="Using docker-in-docker ${DOCKER_VERSION}"
 	if [ "$(ls -A /var/lib/docker)" ]; then
 		print_msg "=> Detected pre-existing /var/lib/docker folder"
 		MOUNTED_DOCKER_FOLDER=yes