@@ -74,7 +74,7 @@ ENV	GOARM	5

 RUN	cd /usr/local/go/src && bash -xc 'for platform in $DOCKER_CROSSPLATFORMS; do GOOS=${platform%/*} GOARCH=${platform##*/} ./make.bash --no-clean 2>&1; done'

 # Grab Go's cover tool for dead-simple code coverage testing

-RUN	go get code.google.com/p/go.tools/cmd/cover

+RUN	go get golang.org/x/tools/cmd/cover

 # TODO replace FPM with some very minimal debhelper stuff

 RUN	gem install --no-rdoc --no-ri fpm --version 1.3.2

@@ -75,7 +75,7 @@ ENV	GOARM	5

 RUN	cd /usr/local/go/src && bash -xc 'for platform in $DOCKER_CROSSPLATFORMS; do GOOS=${platform%/*} GOARCH=${platform##*/} ./make.bash --no-clean 2>&1; done'

 # Grab Go's cover tool for dead-simple code coverage testing

-RUN	go get code.google.com/p/go.tools/cmd/cover

+RUN	go get golang.org/x/tools/cmd/cover

 # TODO replace FPM with some very minimal debhelper stuff

 RUN	gem install --no-rdoc --no-ri fpm --version 1.0.2

@@ -10,7 +10,7 @@

 (env "DOCKER_CROSSPLATFORMS" "linux/386 linux/arm 	darwin/amd64 darwin/386 	freebsd/amd64 freebsd/386 freebsd/arm")

 (env "GOARM" "5")

 (run "cd /usr/local/go/src && bash -xc 'for platform in $DOCKER_CROSSPLATFORMS; do GOOS=${platform%/*} GOARCH=${platform##*/} ./make.bash --no-clean 2>&1; done'")

-(run "go get code.google.com/p/go.tools/cmd/cover")

+(run "go get golang.org/x/tools/cmd/cover")

 (run "gem install --no-rdoc --no-ri fpm --version 1.0.2")

 (run "git clone -b buildroot-2014.02 https://github.com/jpetazzo/docker-busybox.git /docker-busybox")

 (run "/bin/echo -e '[default]\\naccess_key=$AWS_ACCESS_KEY\\nsecret_key=$AWS_SECRET_KEY' > /.s3cfg")