From 9adb299c5b141b6631a931dffe2a715867ac166f Mon Sep 17 00:00:00 2001 From: unclejack Date: Thu, 2 May 2013 15:27:37 +0300 Subject: [PATCH 1/5] use Go 1.0.3 to build docker Upstream-commit: 528da23d6a5e0b6f37c1241c982bb49f301632cc Component: engine --- components/engine/hack/dockerbuilder/Dockerfile | 6 +++++- components/engine/hack/dockerbuilder/dockerbuilder | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/components/engine/hack/dockerbuilder/Dockerfile b/components/engine/hack/dockerbuilder/Dockerfile index 55540984fd..af8dce108c 100644 --- a/components/engine/hack/dockerbuilder/Dockerfile +++ b/components/engine/hack/dockerbuilder/Dockerfile @@ -4,8 +4,12 @@ maintainer Solomon Hykes 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 diff --git a/components/engine/hack/dockerbuilder/dockerbuilder b/components/engine/hack/dockerbuilder/dockerbuilder index 5e803aa0b2..500a82db9f 100644 --- a/components/engine/hack/dockerbuilder/dockerbuilder +++ b/components/engine/hack/dockerbuilder/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 From 30a53731348893d30aa332de5b5c5d3fa62299b2 Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Thu, 2 May 2013 11:25:49 -0700 Subject: [PATCH 2/5] + Hack: 'make s3release' uploads a clean build to s3 Upstream-commit: 6e486b638b6674694fe02d2661bd93f0ee08d425 Component: engine --- components/engine/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/components/engine/Makefile b/components/engine/Makefile index 2d9ba2c605..d4aa4b4721 100644 --- a/components/engine/Makefile +++ b/components/engine/Makefile @@ -59,6 +59,9 @@ $(BINRELEASE): $(SRCRELEASE) rm -f $(BINRELEASE) cd $(SRCRELEASE); make; cp -R bin docker-$(RELEASE_VERSION); tar -f ../$(BINRELEASE) -zv -c docker-$(RELEASE_VERSION) +s3release: $(BINRELEASE) + s3cmd -P put $(BINRELEASE) s3://get.docker.io/builds/`uname -s`/`uname -m`/docker-$(RELEASE_VERSION).tgz + clean: @rm -rf $(dir $(DOCKER_BIN)) ifeq ($(GOPATH), $(BUILD_DIR)) From e7e7fbada843ce69d5ae02596a0caaed338638fd Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Thu, 2 May 2013 11:32:55 -0700 Subject: [PATCH 3/5] Add s3 upload to 'make release' Upstream-commit: b6a5e604ab2205a547ac5b4f743cf3c4b93ffccf Component: engine --- components/engine/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/components/engine/Makefile b/components/engine/Makefile index d4aa4b4721..f35362d2ca 100644 --- a/components/engine/Makefile +++ b/components/engine/Makefile @@ -45,6 +45,8 @@ whichrelease: echo $(RELEASE_VERSION) release: $(BINRELEASE) + s3cmd -P put $(BINRELEASE) s3://get.docker.io/builds/`uname -s`/`uname -m`/docker-$(RELEASE_VERSION).tgz + srcrelease: $(SRCRELEASE) deps: $(DOCKER_DIR) @@ -59,9 +61,6 @@ $(BINRELEASE): $(SRCRELEASE) rm -f $(BINRELEASE) cd $(SRCRELEASE); make; cp -R bin docker-$(RELEASE_VERSION); tar -f ../$(BINRELEASE) -zv -c docker-$(RELEASE_VERSION) -s3release: $(BINRELEASE) - s3cmd -P put $(BINRELEASE) s3://get.docker.io/builds/`uname -s`/`uname -m`/docker-$(RELEASE_VERSION).tgz - clean: @rm -rf $(dir $(DOCKER_BIN)) ifeq ($(GOPATH), $(BUILD_DIR)) From c3c94876c54ab346d6e82f299527793689de479f Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Thu, 2 May 2013 18:11:54 -0700 Subject: [PATCH 4/5] dockerbuilder: let the Makefile upload to s3 with 'make release' Upstream-commit: c08d245539ef4d721b874392097016a1c8c8fb81 Component: engine --- .../engine/hack/dockerbuilder/dockerbuilder | 21 +++---------------- 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/components/engine/hack/dockerbuilder/dockerbuilder b/components/engine/hack/dockerbuilder/dockerbuilder index 500a82db9f..4287e0b336 100644 --- a/components/engine/hack/dockerbuilder/dockerbuilder +++ b/components/engine/hack/dockerbuilder/dockerbuilder @@ -15,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 @@ -28,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 From fddd243545d39fcadf2a0d507ab6711e983af05d Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Thu, 2 May 2013 19:22:41 -0700 Subject: [PATCH 5/5] dockerbuilder: change order of dependencies Upstream-commit: a82b60b30dd9b07d6ea8cd96555a798900c17caa Component: engine --- components/engine/hack/dockerbuilder/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/engine/hack/dockerbuilder/Dockerfile b/components/engine/hack/dockerbuilder/Dockerfile index af8dce108c..98dde05f27 100644 --- a/components/engine/hack/dockerbuilder/Dockerfile +++ b/components/engine/hack/dockerbuilder/Dockerfile @@ -15,9 +15,9 @@ 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"]