Browse code

dockerbuilder: use a pristine GOPATH, with the fresh checkout registered at the right path (for internal submodules)

Solomon Hykes authored on 2013/04/24 03:45:47
Showing 1 changed files
... ...
@@ -11,6 +11,7 @@ fi
11 11
 
12 12
 export REVISION=$1 AWS_ID=$2 AWS_KEY=$3
13 13
 
14
+START=$(pwd)
14 15
 mkdir -p go/src/$PACKAGE
15 16
 git clone "https://$PACKAGE" go/src/$PACKAGE
16 17
 cd go/src/$PACKAGE
... ...
@@ -18,10 +19,10 @@ git checkout $REVISION
18 18
 
19 19
 # FIXME: checkout to specific revision
20 20
 
21
-BUILDDIR=docker-$REVISION
21
+BUILDDIR=${START}/docker-$REVISION
22 22
 mkdir -p $BUILDDIR
23
-(cd docker && go get && go build -o $BUILDDIR/docker)
23
+(export GOPATH=${START}/go; cd docker && go get -v && go build -v -o $BUILDDIR/docker)
24 24
 
25
-BUILD_ARCHIVE=docker-$REVISION.tgz
26
-tar -f BUILD_ARCHIVE -C $(dirname $BUILDDIR) -zc $(basename $BUILDDIR)
27
-s3cmd -P put /tmp/docker.tgz s3://get.docker.io/builds/$(uname -s)/$(uname -m)/docker-$REVISION.tgz
25
+BUILD_ARCHIVE=${START}/docker-$REVISION.tgz
26
+tar -f $BUILD_ARCHIVE -C $(dirname $BUILDDIR) -zc $(basename $BUILDDIR)
27
+s3cmd -P put $BUILD_ARCHIVE s3://get.docker.io/builds/$(uname -s)/$(uname -m)/docker-$REVISION.tgz