Move all build scripts to script/build

Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2016-01-15 16:27:43 -05:00
parent 38dd342b7b
commit a87d482a3b
11 changed files with 11 additions and 11 deletions

View File

@ -11,7 +11,7 @@ build: false
test_script: test_script:
- "tox -e py27,py34 -- tests/unit" - "tox -e py27,py34 -- tests/unit"
- ps: ".\\script\\build-windows.ps1" - ps: ".\\script\\build\\windows.ps1"
artifacts: artifacts:
- path: .\dist\docker-compose-Windows-x86_64.exe - path: .\dist\docker-compose-Windows-x86_64.exe

View File

@ -58,7 +58,7 @@ When prompted build the non-linux binaries and test them.
1. Build the Mac binary in a Mountain Lion VM: 1. Build the Mac binary in a Mountain Lion VM:
script/prepare-osx script/prepare-osx
script/build-osx script/build/osx
2. Download the windows binary from AppVeyor 2. Download the windows binary from AppVeyor

View File

@ -7,7 +7,7 @@ set -ex
TAG="docker-compose" TAG="docker-compose"
docker build -t "$TAG" . | tail -n 200 docker build -t "$TAG" . | tail -n 200
docker run \ docker run \
--rm --entrypoint="script/build-linux-inner" \ --rm --entrypoint="script/build/linux-entrypoint" \
-v $(pwd)/dist:/code/dist \ -v $(pwd)/dist:/code/dist \
-v $(pwd)/.git:/code/.git \ -v $(pwd)/.git:/code/.git \
"$TAG" "$TAG"

View File

@ -26,7 +26,7 @@
# #
# 6. Build the binary: # 6. Build the binary:
# #
# .\script\build-windows.ps1 # .\script\build\windows.ps1
$ErrorActionPreference = "Stop" $ErrorActionPreference = "Stop"

View File

@ -18,4 +18,4 @@ GIT_VOLUME="--volumes-from=$(hostname)"
. script/test-versions . script/test-versions
>&2 echo "Building Linux binary" >&2 echo "Building Linux binary"
. script/build-linux-inner . script/build/linux-entrypoint

View File

@ -22,15 +22,15 @@ REPO=docker/compose
# Build the binaries # Build the binaries
script/clean script/clean
script/build-linux script/build/linux
# TODO: build osx binary # TODO: build osx binary
# script/prepare-osx # script/prepare-osx
# script/build-osx # script/build/osx
# TODO: build or fetch the windows binary # TODO: build or fetch the windows binary
echo "You need to build the osx/windows binaries, that step is not automated yet." echo "You need to build the osx/windows binaries, that step is not automated yet."
echo "Building the container distribution" echo "Building the container distribution"
script/build-image $VERSION script/build/image $VERSION
echo "Create a github release" echo "Create a github release"
# TODO: script more of this https://developer.github.com/v3/repos/releases/ # TODO: script more of this https://developer.github.com/v3/repos/releases/

View File

@ -3,11 +3,11 @@
set -ex set -ex
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
script/build-linux script/build/linux
# TODO: requires auth to push, so disable for now # TODO: requires auth to push, so disable for now
# script/build-image master # script/build/image master
# docker push docker/compose:master # docker push docker/compose:master
else else
script/prepare-osx script/prepare-osx
script/build-osx script/build/osx
fi fi