From a87d482a3bad04e211103c484b54580e243a9b4c Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 15 Jan 2016 16:27:43 -0500
Subject: [PATCH 1/3] Move all build scripts to script/build

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 appveyor.yml                                         | 2 +-
 project/RELEASE-PROCESS.md                           | 2 +-
 script/{build-image => build/image}                  | 0
 script/{build-linux => build/linux}                  | 2 +-
 script/{build-linux-inner => build/linux-entrypoint} | 0
 script/{build-osx => build/osx}                      | 0
 script/{build-windows.ps1 => build/windows.ps1}      | 2 +-
 script/ci                                            | 2 +-
 script/release/build-binaries                        | 6 +++---
 script/{test => test-default}                        | 0
 script/travis/build-binary                           | 6 +++---
 11 files changed, 11 insertions(+), 11 deletions(-)
 rename script/{build-image => build/image} (100%)
 rename script/{build-linux => build/linux} (76%)
 rename script/{build-linux-inner => build/linux-entrypoint} (100%)
 rename script/{build-osx => build/osx} (100%)
 rename script/{build-windows.ps1 => build/windows.ps1} (97%)
 rename script/{test => test-default} (100%)

diff --git a/appveyor.yml b/appveyor.yml
index 489be0213..e4f39544a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,7 +11,7 @@ build: false
 
 test_script:
   - "tox -e py27,py34 -- tests/unit"
-  - ps: ".\\script\\build-windows.ps1"
+  - ps: ".\\script\\build\\windows.ps1"
 
 artifacts:
   - path: .\dist\docker-compose-Windows-x86_64.exe
diff --git a/project/RELEASE-PROCESS.md b/project/RELEASE-PROCESS.md
index 040a2602b..14d930881 100644
--- a/project/RELEASE-PROCESS.md
+++ b/project/RELEASE-PROCESS.md
@@ -58,7 +58,7 @@ When prompted build the non-linux binaries and test them.
 1.  Build the Mac binary in a Mountain Lion VM:
 
         script/prepare-osx
-        script/build-osx
+        script/build/osx
 
 2.  Download the windows binary from AppVeyor
 
diff --git a/script/build-image b/script/build/image
similarity index 100%
rename from script/build-image
rename to script/build/image
diff --git a/script/build-linux b/script/build/linux
similarity index 76%
rename from script/build-linux
rename to script/build/linux
index 47fb45e17..1a4cd4d9b 100755
--- a/script/build-linux
+++ b/script/build/linux
@@ -7,7 +7,7 @@ set -ex
 TAG="docker-compose"
 docker build -t "$TAG" . | tail -n 200
 docker run \
-    --rm --entrypoint="script/build-linux-inner" \
+    --rm --entrypoint="script/build/linux-entrypoint" \
     -v $(pwd)/dist:/code/dist \
     -v $(pwd)/.git:/code/.git \
     "$TAG"
diff --git a/script/build-linux-inner b/script/build/linux-entrypoint
similarity index 100%
rename from script/build-linux-inner
rename to script/build/linux-entrypoint
diff --git a/script/build-osx b/script/build/osx
similarity index 100%
rename from script/build-osx
rename to script/build/osx
diff --git a/script/build-windows.ps1 b/script/build/windows.ps1
similarity index 97%
rename from script/build-windows.ps1
rename to script/build/windows.ps1
index 4a2bc1f77..db643274c 100644
--- a/script/build-windows.ps1
+++ b/script/build/windows.ps1
@@ -26,7 +26,7 @@
 #
 # 6. Build the binary:
 #
-#        .\script\build-windows.ps1
+#        .\script\build\windows.ps1
 
 $ErrorActionPreference = "Stop"
 
diff --git a/script/ci b/script/ci
index f30265c02..f73be8428 100755
--- a/script/ci
+++ b/script/ci
@@ -18,4 +18,4 @@ GIT_VOLUME="--volumes-from=$(hostname)"
 . script/test-versions
 
 >&2 echo "Building Linux binary"
-. script/build-linux-inner
+. script/build/linux-entrypoint
diff --git a/script/release/build-binaries b/script/release/build-binaries
index 083f8eb58..3a57b89a8 100755
--- a/script/release/build-binaries
+++ b/script/release/build-binaries
@@ -22,15 +22,15 @@ REPO=docker/compose
 
 # Build the binaries
 script/clean
-script/build-linux
+script/build/linux
 # TODO: build osx binary
 # script/prepare-osx
-# script/build-osx
+# script/build/osx
 # TODO: build or fetch the windows binary
 echo "You need to build the osx/windows binaries, that step is not automated yet."
 
 echo "Building the container distribution"
-script/build-image $VERSION
+script/build/image $VERSION
 
 echo "Create a github release"
 # TODO: script more of this https://developer.github.com/v3/repos/releases/
diff --git a/script/test b/script/test-default
similarity index 100%
rename from script/test
rename to script/test-default
diff --git a/script/travis/build-binary b/script/travis/build-binary
index 7cc1092dd..065244bf5 100755
--- a/script/travis/build-binary
+++ b/script/travis/build-binary
@@ -3,11 +3,11 @@
 set -ex
 
 if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-    script/build-linux
+    script/build/linux
     # TODO: requires auth to push, so disable for now
-    # script/build-image master
+    # script/build/image master
     # docker push docker/compose:master
 else
     script/prepare-osx
-    script/build-osx
+    script/build/osx
 fi

From ec6bb1660dde7e6700e894edb2235bdcf08a3a35 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 15 Jan 2016 16:31:30 -0500
Subject: [PATCH 2/3] Move run scripts to script/run

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 project/RELEASE-PROCESS.md |  2 +-
 script/dev                 | 21 ---------------------
 script/release/make-branch |  4 ++--
 script/{ => run}/run.ps1   |  0
 script/{ => run}/run.sh    |  0
 script/shell               |  4 ----
 6 files changed, 3 insertions(+), 28 deletions(-)
 delete mode 100755 script/dev
 rename script/{ => run}/run.ps1 (100%)
 rename script/{ => run}/run.sh (100%)
 delete mode 100755 script/shell

diff --git a/project/RELEASE-PROCESS.md b/project/RELEASE-PROCESS.md
index 14d930881..4b78a9ba0 100644
--- a/project/RELEASE-PROCESS.md
+++ b/project/RELEASE-PROCESS.md
@@ -88,7 +88,7 @@ When prompted build the non-linux binaries and test them.
 
         ...release notes go here...
 
-5.  Attach the binaries and `script/run.sh`
+5.  Attach the binaries and `script/run/run.sh`
 
 6.  Add "Thanks" with a list of contributors. The contributor list can be generated
     by running `./script/release/contributors`.
diff --git a/script/dev b/script/dev
deleted file mode 100755
index 80b3d0131..000000000
--- a/script/dev
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-# This is a script for running Compose inside a Docker container. It's handy for
-# development.
-#
-# $ ln -s `pwd`/script/dev /usr/local/bin/docker-compose
-# $ cd /a/compose/project
-# $ docker-compose up
-# 
-
-set -e
-
-# Follow symbolic links
-if [ -h "$0" ]; then
-    DIR=$(readlink "$0")
-else
-    DIR=$0
-fi
-DIR="$(dirname "$DIR")"/..
-
-docker build -t docker-compose $DIR
-exec docker run -i -t -v /var/run/docker.sock:/var/run/docker.sock -v `pwd`:`pwd` -w `pwd` docker-compose $@
diff --git a/script/release/make-branch b/script/release/make-branch
index 46ba6bbca..86b4c9f64 100755
--- a/script/release/make-branch
+++ b/script/release/make-branch
@@ -65,10 +65,10 @@ git config "branch.${BRANCH}.release" $VERSION
 
 editor=${EDITOR:-vim}
 
-echo "Update versions in docs/install.md, compose/__init__.py, script/run.sh"
+echo "Update versions in docs/install.md, compose/__init__.py, script/run/run.sh"
 $editor docs/install.md
 $editor compose/__init__.py
-$editor script/run.sh
+$editor script/run/run.sh
 
 
 echo "Write release notes in CHANGELOG.md"
diff --git a/script/run.ps1 b/script/run/run.ps1
similarity index 100%
rename from script/run.ps1
rename to script/run/run.ps1
diff --git a/script/run.sh b/script/run/run.sh
similarity index 100%
rename from script/run.sh
rename to script/run/run.sh
diff --git a/script/shell b/script/shell
deleted file mode 100755
index 903be76fc..000000000
--- a/script/shell
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-set -ex
-docker build -t docker-compose .
-exec docker run -v /var/run/docker.sock:/var/run/docker.sock -v `pwd`:/code -ti --rm --entrypoint bash docker-compose

From 11dc7207520be98f70ac38e000c8a90975908e39 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 15 Jan 2016 16:35:26 -0500
Subject: [PATCH 3/3] Move test scripts to script/test.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 CONTRIBUTING.md                       | 14 +++++++-------
 project/RELEASE-PROCESS.md            |  2 +-
 script/build/image                    |  2 +-
 script/build/linux-entrypoint         |  2 +-
 script/build/osx                      |  2 +-
 script/{ => build}/write-git-sha      |  0
 script/ci                             | 25 ++++++-------------------
 script/release/build-binaries         |  2 +-
 script/release/push-release           |  2 +-
 script/{prepare-osx => setup/osx}     |  0
 script/{test-versions => test/all}    |  2 +-
 script/test/ci                        | 25 +++++++++++++++++++++++++
 script/{test-default => test/default} |  2 +-
 script/{ => test}/versions.py         |  0
 script/travis/build-binary            |  2 +-
 15 files changed, 47 insertions(+), 35 deletions(-)
 rename script/{ => build}/write-git-sha (100%)
 rename script/{prepare-osx => setup/osx} (100%)
 rename script/{test-versions => test/all} (96%)
 create mode 100755 script/test/ci
 rename script/{test-default => test/default} (92%)
 rename script/{ => test}/versions.py (100%)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 66224752d..50e58ddca 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -50,22 +50,22 @@ See Docker's [basic contribution workflow](https://docs.docker.com/opensource/wo
 Use the test script to run linting checks and then the full test suite against
 different Python interpreters:
 
-    $ script/test
+    $ script/test/default
 
 Tests are run against a Docker daemon inside a container, so that we can test
 against multiple Docker versions. By default they'll run against only the latest
 Docker version - set the `DOCKER_VERSIONS` environment variable to "all" to run
 against all supported versions:
 
-    $ DOCKER_VERSIONS=all script/test
+    $ DOCKER_VERSIONS=all script/test/default
 
-Arguments to `script/test` are passed through to the `nosetests` executable, so
+Arguments to `script/test/default` are passed through to the `tox` executable, so
 you can specify a test directory, file, module, class or method:
 
-    $ script/test tests/unit
-    $ script/test tests/unit/cli_test.py
-    $ script/test tests/unit/config_test.py::ConfigTest
-    $ script/test tests/unit/config_test.py::ConfigTest::test_load
+    $ script/test/default tests/unit
+    $ script/test/default tests/unit/cli_test.py
+    $ script/test/default tests/unit/config_test.py::ConfigTest
+    $ script/test/default tests/unit/config_test.py::ConfigTest::test_load
 
 ## Finding things to work on
 
diff --git a/project/RELEASE-PROCESS.md b/project/RELEASE-PROCESS.md
index 4b78a9ba0..de94aae84 100644
--- a/project/RELEASE-PROCESS.md
+++ b/project/RELEASE-PROCESS.md
@@ -57,7 +57,7 @@ When prompted build the non-linux binaries and test them.
 
 1.  Build the Mac binary in a Mountain Lion VM:
 
-        script/prepare-osx
+        script/setup/osx
         script/build/osx
 
 2.  Download the windows binary from AppVeyor
diff --git a/script/build/image b/script/build/image
index 897335054..bdd98f03e 100755
--- a/script/build/image
+++ b/script/build/image
@@ -10,7 +10,7 @@ fi
 TAG=$1
 VERSION="$(python setup.py --version)"
 
-./script/write-git-sha
+./script/build/write-git-sha
 python setup.py sdist
 cp dist/docker-compose-$VERSION.tar.gz dist/docker-compose-release.tar.gz
 docker build -t docker/compose:$TAG -f Dockerfile.run .
diff --git a/script/build/linux-entrypoint b/script/build/linux-entrypoint
index 9bf7c95d9..bf515060a 100755
--- a/script/build/linux-entrypoint
+++ b/script/build/linux-entrypoint
@@ -9,7 +9,7 @@ mkdir -p `pwd`/dist
 chmod 777 `pwd`/dist
 
 $VENV/bin/pip install -q -r requirements-build.txt
-./script/write-git-sha
+./script/build/write-git-sha
 su -c "$VENV/bin/pyinstaller docker-compose.spec" user
 mv dist/docker-compose $TARGET
 $TARGET version
diff --git a/script/build/osx b/script/build/osx
index 168fd4309..3de345762 100755
--- a/script/build/osx
+++ b/script/build/osx
@@ -9,7 +9,7 @@ virtualenv -p /usr/local/bin/python venv
 venv/bin/pip install -r requirements.txt
 venv/bin/pip install -r requirements-build.txt
 venv/bin/pip install --no-deps .
-./script/write-git-sha
+./script/build/write-git-sha
 venv/bin/pyinstaller docker-compose.spec
 mv dist/docker-compose dist/docker-compose-Darwin-x86_64
 dist/docker-compose-Darwin-x86_64 version
diff --git a/script/write-git-sha b/script/build/write-git-sha
similarity index 100%
rename from script/write-git-sha
rename to script/build/write-git-sha
diff --git a/script/ci b/script/ci
index f73be8428..7b3489a1b 100755
--- a/script/ci
+++ b/script/ci
@@ -1,21 +1,8 @@
 #!/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 -ex
-
-docker version
-
-export DOCKER_VERSIONS=all
-STORAGE_DRIVER=${STORAGE_DRIVER:-overlay}
-export DOCKER_DAEMON_ARGS="--storage-driver=$STORAGE_DRIVER"
-
-GIT_VOLUME="--volumes-from=$(hostname)"
-. script/test-versions
-
->&2 echo "Building Linux binary"
-. script/build/linux-entrypoint
+# Backwards compatiblity for jenkins
+#
+# TODO: remove this script after all current PRs and jenkins are updated with
+# the new script/test/ci change
+set -e
+exec script/test/ci
diff --git a/script/release/build-binaries b/script/release/build-binaries
index 3a57b89a8..d076197cb 100755
--- a/script/release/build-binaries
+++ b/script/release/build-binaries
@@ -24,7 +24,7 @@ REPO=docker/compose
 script/clean
 script/build/linux
 # TODO: build osx binary
-# script/prepare-osx
+# script/setup/osx
 # script/build/osx
 # TODO: build or fetch the windows binary
 echo "You need to build the osx/windows binaries, that step is not automated yet."
diff --git a/script/release/push-release b/script/release/push-release
index 7d9ec0a2c..33d0d7772 100755
--- a/script/release/push-release
+++ b/script/release/push-release
@@ -57,7 +57,7 @@ docker push docker/compose:$VERSION
 echo "Uploading sdist to pypi"
 pandoc -f markdown -t rst README.md -o README.rst
 sed -i -e 's/logo.png?raw=true/https:\/\/github.com\/docker\/compose\/raw\/master\/logo.png?raw=true/' README.rst
-./script/write-git-sha
+./script/build/write-git-sha
 python setup.py sdist
 if [ "$(command -v twine 2> /dev/null)" ]; then
     twine upload ./dist/docker-compose-${VERSION/-/}.tar.gz
diff --git a/script/prepare-osx b/script/setup/osx
similarity index 100%
rename from script/prepare-osx
rename to script/setup/osx
diff --git a/script/test-versions b/script/test/all
similarity index 96%
rename from script/test-versions
rename to script/test/all
index 14a3e6e4d..08bf16188 100755
--- a/script/test-versions
+++ b/script/test/all
@@ -14,7 +14,7 @@ docker run --rm \
 get_versions="docker run --rm
     --entrypoint=/code/.tox/py27/bin/python
     $TAG
-    /code/script/versions.py docker/docker"
+    /code/script/test/versions.py docker/docker"
 
 if [ "$DOCKER_VERSIONS" == "" ]; then
   DOCKER_VERSIONS="$($get_versions default)"
diff --git a/script/test/ci b/script/test/ci
new file mode 100755
index 000000000..c5927b2c9
--- /dev/null
+++ b/script/test/ci
@@ -0,0 +1,25 @@
+#!/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/test/ci" "$TAG"
+
+set -ex
+
+docker version
+
+export DOCKER_VERSIONS=all
+STORAGE_DRIVER=${STORAGE_DRIVER:-overlay}
+export DOCKER_DAEMON_ARGS="--storage-driver=$STORAGE_DRIVER"
+
+GIT_VOLUME="--volumes-from=$(hostname)"
+. script/test/all
+
+>&2 echo "Building Linux binary"
+. script/build/linux-entrypoint
diff --git a/script/test-default b/script/test/default
similarity index 92%
rename from script/test-default
rename to script/test/default
index bdb3579b0..fa741a19d 100755
--- a/script/test-default
+++ b/script/test/default
@@ -12,4 +12,4 @@ mkdir -p coverage-html
 docker build -t "$TAG" .
 
 GIT_VOLUME="--volume=$(pwd)/.git:/code/.git"
-. script/test-versions
+. script/test/all
diff --git a/script/versions.py b/script/test/versions.py
similarity index 100%
rename from script/versions.py
rename to script/test/versions.py
diff --git a/script/travis/build-binary b/script/travis/build-binary
index 065244bf5..7707a1eee 100755
--- a/script/travis/build-binary
+++ b/script/travis/build-binary
@@ -8,6 +8,6 @@ if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
     # script/build/image master
     # docker push docker/compose:master
 else
-    script/prepare-osx
+    script/setup/osx
     script/build/osx
 fi