Skip to content

Commit 04fb217

Browse files
committed
Ditch the vendor/ directory
Go modules are pretty good at finding the right source, so let's just trust them to do so instead of keeping our own local copy.
1 parent 6e218b8 commit 04fb217

File tree

487 files changed

+10
-100133
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

487 files changed

+10
-100133
lines changed

.dockerignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@
44
!go.mod
55
!go.sum
66
!scripts/
7-
!vendor/

Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,18 @@ SHELL ["bash", "-Eeuo", "pipefail", "-xc"]
44

55
RUN apt-get update; \
66
apt-get install -y --no-install-recommends \
7+
git \
78
golang-go \
89
; \
910
rm -rf /var/lib/apt/lists/*
1011

1112
WORKDIR /usr/src/bashbrew
12-
COPY go.mod go.sum bashbrew.sh ./
13+
14+
COPY go.mod go.sum ./
15+
RUN go mod download; go mod verify
16+
17+
COPY bashbrew.sh ./
1318
COPY cmd cmd
14-
COPY vendor vendor
1519
RUN export CGO_ENABLED=0; \
1620
bash -x ./bashbrew.sh --version; \
1721
rm -r ~/.cache/go-build; \

Dockerfile.release

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ RUN export GNUPGHOME="$(mktemp -d)"; \
6060
ls -lAFh bin/manifest-tool-*; \
6161
file bin/manifest-tool-*
6262

63+
COPY go.mod go.sum ./
64+
RUN go mod download; go mod verify
65+
6366
COPY . .
6467

6568
RUN for bashbrewArch in $BASHBREW_ARCHES; do \
@@ -78,7 +81,6 @@ RUN for bashbrewArch in $BASHBREW_ARCHES; do \
7881
-v -ldflags "$LDFLAGS" \
7982
-tags netgo -installsuffix netgo \
8083
-o "$targetBin" \
81-
-mod vendor \
8284
./cmd/bashbrew \
8385
; \
8486
ls -lAFh "$targetBin"; \

bashbrew.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dir="$(dirname "$dir")"
99
export GO111MODULE=on
1010
(
1111
cd "$dir"
12-
go build -o bin/bashbrew -mod vendor ./cmd/bashbrew > /dev/null
12+
go build -o bin/bashbrew ./cmd/bashbrew > /dev/null
1313
)
1414

1515
exec "$dir/bin/bashbrew" "$@"

vendor/github.com/codegangsta/cli/.flake8

Lines changed: 0 additions & 2 deletions
This file was deleted.

vendor/github.com/codegangsta/cli/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

vendor/github.com/codegangsta/cli/.travis.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)