Merge remote-tracking branch 'upstream/master'

.travis.yml

@@ -5,18 +5,7 @@ go: 1.7.x
 sudo: false
 
 install:
-    - |
-        GB_VERSION=$(awk '$1 == "ENV" && $2 == "GB_VERSION" { print $3; exit }' Dockerfile)
-        firstGo="${GOPATH%%:*}"
-        mkdir -p "$firstGo/src/github.com/constabulary"
-        (
-            cd "$firstGo/src/github.com/constabulary"
-            wget -qO- "https://github.com/constabulary/gb/archive/v${GB_VERSION}.tar.gz" \
-                | tar -xz
-            mv gb-* gb
-            cd gb
-            go install -v ./...
-        )
+    - go get -v -u github.com/constabulary/gb/...
 
 before_script:
     - env | sort

Dockerfile

@@ -4,21 +4,11 @@ RUN apk add --no-cache \
 # bash for running scripts
 		bash \
 # go for compiling bashbrew
-		go
+		go libc-dev
 
 ENV GOPATH /go
 ENV PATH $GOPATH/bin:$PATH
 
-ENV GB_VERSION 0.4.1
-RUN set -x \
-	&& mkdir -p /go/src/github.com/constabulary \
-	&& cd /go/src/github.com/constabulary \
-	&& wget -qO- "https://github.com/constabulary/gb/archive/v${GB_VERSION}.tar.gz" \
-		| tar -xz \
-	&& mv gb-* gb \
-	&& cd gb \
-	&& go install -v ./...
-
 ENV DIR /usr/src/official-images
 ENV PATH $DIR/bashbrew/go/bin:$PATH
 
@@ -33,7 +23,11 @@ RUN mkdir -p "$BASHBREW_CACHE" \
 WORKDIR $DIR
 COPY . $DIR
 
-RUN cd bashbrew/go && gb build
+RUN set -ex; \
+	cd bashbrew/go; \
+	export GOPATH="$PWD:$PWD/vendor"; \
+	cd src; \
+	go install -v ./...
 
 VOLUME $BASHBREW_CACHE