Merge pull request #6 from infosiftr/no-vendor

Ditch the vendor/ directory

Author: tianon

.dockerignore

@@ -4,4 +4,3 @@
 !go.mod
 !go.sum
 !scripts/
-!vendor/

Dockerfile

@@ -4,14 +4,18 @@ SHELL ["bash", "-Eeuo", "pipefail", "-xc"]
 
 RUN apt-get update; \
 	apt-get install -y --no-install-recommends \
+		git \
 		golang-go \
 	; \
 	rm -rf /var/lib/apt/lists/*
 
 WORKDIR /usr/src/bashbrew
-COPY go.mod go.sum bashbrew.sh ./
+
+COPY go.mod go.sum ./
+RUN go mod download; go mod verify
+
+COPY bashbrew.sh ./
 COPY cmd cmd
-COPY vendor vendor
 RUN export CGO_ENABLED=0; \
 	bash -x ./bashbrew.sh --version; \
 	rm -r ~/.cache/go-build; \

Dockerfile.release

@@ -60,6 +60,9 @@ RUN export GNUPGHOME="$(mktemp -d)"; \
 	ls -lAFh bin/manifest-tool-*; \
 	file bin/manifest-tool-*
 
+COPY go.mod go.sum ./
+RUN go mod download; go mod verify
+
 COPY . .
 
 RUN for bashbrewArch in $BASHBREW_ARCHES; do \
@@ -78,7 +81,6 @@ RUN for bashbrewArch in $BASHBREW_ARCHES; do \
 				-v -ldflags "$LDFLAGS" \
 				-tags netgo -installsuffix netgo \
 				-o "$targetBin" \
-				-mod vendor \
 				./cmd/bashbrew \
 			; \
 			ls -lAFh "$targetBin"; \

bashbrew.sh

@@ -9,7 +9,7 @@ dir="$(dirname "$dir")"
 export GO111MODULE=on
 (
 	cd "$dir"
-	go build -o bin/bashbrew -mod vendor ./cmd/bashbrew > /dev/null
+	go build -o bin/bashbrew ./cmd/bashbrew > /dev/null
 )
 
 exec "$dir/bin/bashbrew" "$@"