From e03b241fb18fa5dab4ec94c3d86eacb21601ac66 Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Tue, 23 Apr 2013 12:07:54 -0700 Subject: [PATCH] dockerbuilder: build with 'make; cp -R ./bin' --- hack/dockerbuilder/dockerbuilder | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/hack/dockerbuilder/dockerbuilder b/hack/dockerbuilder/dockerbuilder index 17381e40e0..de9f94f9f5 100644 --- a/hack/dockerbuilder/dockerbuilder +++ b/hack/dockerbuilder/dockerbuilder @@ -12,16 +12,13 @@ fi export REVISION=$1 AWS_ID=$2 AWS_KEY=$3 START=$(pwd) -mkdir -p go/src/$PACKAGE -git clone "https://$PACKAGE" go/src/$PACKAGE -cd go/src/$PACKAGE +git clone "https://$PACKAGE" docker-checkout-$REVISION +cd docker-checkout-$REVISION git checkout $REVISION -# FIXME: checkout to specific revision - +make BUILDDIR=${START}/docker-$REVISION -mkdir -p $BUILDDIR -(export GOPATH=${START}/go; cd docker && go get -v && go build -v -o $BUILDDIR/docker) +cp -R ./bin $BUILDDIR BUILD_ARCHIVE=${START}/docker-$REVISION.tgz tar -f $BUILD_ARCHIVE -C $(dirname $BUILDDIR) -zc $(basename $BUILDDIR)