mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge branch 'master' into remote-api
This commit is contained in:
commit
75418ec849
2 changed files with 12 additions and 21 deletions
|
@ -4,16 +4,20 @@ maintainer Solomon Hykes <solomon@dotcloud.com>
|
|||
from ubuntu:12.10
|
||||
run apt-get update
|
||||
run DEBIAN_FRONTEND=noninteractive apt-get install -y -q s3cmd
|
||||
run DEBIAN_FRONTEND=noninteractive apt-get install -y -q curl
|
||||
# Packages required to checkout and build docker
|
||||
run DEBIAN_FRONTEND=noninteractive apt-get install -y -q golang
|
||||
run curl -s -o /go.tar.gz https://go.googlecode.com/files/go1.0.3.linux-amd64.tar.gz
|
||||
run tar -C /usr/local -xzf /go.tar.gz
|
||||
run echo "export PATH=$PATH:/usr/local/go/bin" > /.bashrc
|
||||
run echo "export PATH=$PATH:/usr/local/go/bin" > /.bash_profile
|
||||
run DEBIAN_FRONTEND=noninteractive apt-get install -y -q git
|
||||
run DEBIAN_FRONTEND=noninteractive apt-get install -y -q build-essential
|
||||
# Packages required to build an ubuntu package
|
||||
run DEBIAN_FRONTEND=noninteractive apt-get install -y -q debhelper
|
||||
run DEBIAN_FRONTEND=noninteractive apt-get install -y -q autotools-dev
|
||||
copy fake_initctl /usr/local/bin/initctl
|
||||
run apt-get install -y -q devscripts
|
||||
add . /src
|
||||
run cp /src/dockerbuilder /usr/local/bin/ && chmod +x /usr/local/bin/dockerbuilder
|
||||
run cp /src/fake_initctl /usr/local/bin/initctl && chmod +x /usr/local/bin/initctl
|
||||
run cp /src/s3cfg /.s3cfg
|
||||
run DEBIAN_FRONTEND=noninteractive apt-get install -y -q devscripts
|
||||
cmd ["dockerbuilder"]
|
||||
|
|
|
@ -2,6 +2,8 @@
|
|||
set -x
|
||||
set -e
|
||||
|
||||
export PATH=$PATH:/usr/local/go/bin
|
||||
|
||||
PACKAGE=github.com/dotcloud/docker
|
||||
|
||||
if [ $# -gt 1 ]; then
|
||||
|
@ -13,12 +15,10 @@ export REVISION=$1
|
|||
|
||||
if [ -z "$AWS_ID" ]; then
|
||||
echo "Warning: environment variable AWS_ID is not set. Won't upload to S3."
|
||||
NO_S3=1
|
||||
fi
|
||||
|
||||
if [ -z "$AWS_KEY" ]; then
|
||||
echo "Warning: environment variable AWS_KEY is not set. Won't upload to S3."
|
||||
NO_S3=1
|
||||
fi
|
||||
|
||||
if [ -z "$GPG_KEY" ]; then
|
||||
|
@ -26,28 +26,15 @@ if [ -z "$GPG_KEY" ]; then
|
|||
NO_UBUNTU=1
|
||||
fi
|
||||
|
||||
if [ -z "$REVISION" ]; then
|
||||
rm -fr docker-master
|
||||
git clone https://github.com/dotcloud/docker docker-master
|
||||
cd docker-master
|
||||
else
|
||||
rm -fr docker-$REVISION
|
||||
git init docker-$REVISION
|
||||
cd docker-$REVISION
|
||||
git fetch -t https://github.com/dotcloud/docker $REVISION:$REVISION
|
||||
git reset --hard FETCH_HEAD
|
||||
fi
|
||||
|
||||
rm -fr docker-release
|
||||
git clone https://github.com/dotcloud/docker docker-release
|
||||
cd docker-release
|
||||
if [ -z "$REVISION" ]; then
|
||||
make release
|
||||
else
|
||||
make release RELEASE_VERSION=$REVISION
|
||||
fi
|
||||
|
||||
if [ -z "$NO_S3" ]; then
|
||||
s3cmd -P put docker-$REVISION.tgz s3://get.docker.io/builds/$(uname -s)/$(uname -m)/docker-$REVISION.tgz
|
||||
fi
|
||||
|
||||
if [ -z "$NO_UBUNTU" ]; then
|
||||
(cd packaging/ubuntu && make ubuntu)
|
||||
fi
|
||||
|
|
Loading…
Add table
Reference in a new issue