From db852e14e4d8ebc1f0a477360ceef7694970dc59 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 23 Mar 2015 14:16:14 -0700
Subject: [PATCH] Add script/ci

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 Dockerfile               |  3 +++
 script/build-linux       | 18 +++++++++++-------
 script/build-linux-inner | 10 ++++++++++
 script/ci                | 18 ++++++++++++++++++
 script/test-versions     |  5 +----
 script/wrapdocker        |  2 +-
 6 files changed, 44 insertions(+), 12 deletions(-)
 create mode 100755 script/build-linux-inner
 create mode 100755 script/ci

diff --git a/Dockerfile b/Dockerfile
index c9dba927d..594e321f8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,6 +25,9 @@ RUN set -ex; \
     curl https://test.docker.com/builds/Linux/x86_64/docker-1.6.0-rc2 -o /usr/local/bin/docker-1.6.0-rc2; \
     chmod +x /usr/local/bin/docker-1.6.0-rc2
 
+# Set the default Docker to be run
+RUN ln -s /usr/local/bin/docker-1.3.3 /usr/local/bin/docker
+
 RUN useradd -d /home/user -m -s /bin/bash user
 WORKDIR /code/
 
diff --git a/script/build-linux b/script/build-linux
index 07c9d7ec6..5e4a9470e 100755
--- a/script/build-linux
+++ b/script/build-linux
@@ -1,8 +1,12 @@
-#!/bin/sh
+#!/bin/bash
+
 set -ex
-mkdir -p `pwd`/dist
-chmod 777 `pwd`/dist
-docker build -t docker-compose .
-docker run -u user -v `pwd`/dist:/code/dist --rm --entrypoint pyinstaller docker-compose -F bin/docker-compose
-mv dist/docker-compose dist/docker-compose-Linux-x86_64
-docker run -u user -v `pwd`/dist:/code/dist --rm --entrypoint dist/docker-compose-Linux-x86_64 docker-compose --version
+
+TAG="docker-compose"
+docker build -t "$TAG" .
+docker run \
+  --rm \
+  --user=user \
+  --volume="$(pwd):/code" \
+  --entrypoint="script/build-linux-inner" \
+  "$TAG"
diff --git a/script/build-linux-inner b/script/build-linux-inner
new file mode 100755
index 000000000..34b0c06fd
--- /dev/null
+++ b/script/build-linux-inner
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -ex
+
+mkdir -p `pwd`/dist
+chmod 777 `pwd`/dist
+
+pyinstaller -F bin/docker-compose
+mv dist/docker-compose dist/docker-compose-Linux-x86_64
+dist/docker-compose-Linux-x86_64 --version
diff --git a/script/ci b/script/ci
new file mode 100755
index 000000000..a1391c627
--- /dev/null
+++ b/script/ci
@@ -0,0 +1,18 @@
+#!/bin/bash
+# This should be run inside a container built from the Dockerfile
+# at the root of the repo:
+#
+# $ TAG="docker-compose:$(git rev-parse --short HEAD)"
+# $ docker build -t "$TAG" .
+# $ docker run --rm --volume="/var/run/docker.sock:/var/run/docker.sock" --volume="$(pwd)/.git:/code/.git" -e "TAG=$TAG" --entrypoint="script/ci" "$TAG"
+
+set -e
+
+>&2 echo "Validating DCO"
+script/validate-dco
+
+export DOCKER_VERSIONS=all
+. script/test-versions
+
+>&2 echo "Building Linux binary"
+su -c script/build-linux-inner user
diff --git a/script/test-versions b/script/test-versions
index 166c1ef4e..dc54d7f26 100755
--- a/script/test-versions
+++ b/script/test-versions
@@ -4,9 +4,6 @@
 
 set -e
 
->&2 echo "Validating DCO"
-script/validate-dco
-
 >&2 echo "Running lint checks"
 flake8 compose tests setup.py
 
@@ -18,7 +15,7 @@ fi
 
 for version in $DOCKER_VERSIONS; do
   >&2 echo "Running tests against Docker $version"
-  docker-1.5.0 run \
+  docker run \
     --rm \
     --privileged \
     --volume="/var/lib/docker" \
diff --git a/script/wrapdocker b/script/wrapdocker
index 20dc9e3ce..7b699688a 100755
--- a/script/wrapdocker
+++ b/script/wrapdocker
@@ -4,7 +4,7 @@ if [ "$DOCKER_VERSION" == "" ]; then
     DOCKER_VERSION="1.5.0"
 fi
 
-ln -s "/usr/local/bin/docker-$DOCKER_VERSION" "/usr/local/bin/docker"
+ln -fs "/usr/local/bin/docker-$DOCKER_VERSION" "/usr/local/bin/docker"
 
 # If a pidfile is still around (for example after a container restart),
 # delete it so that docker can start.