*: remove glide from README & Dockerfile

This commit is contained in:
Jimmy Zelinskie 2017-12-29 17:12:17 -05:00
parent 5840cd3de1
commit e9d1e71276
2 changed files with 9 additions and 9 deletions

View file

@ -1,18 +1,18 @@
FROM golang:alpine AS build-env FROM golang:alpine AS build-env
LABEL maintainer "Jimmy Zelinskie <jimmyzelinskie@gmail.com>" LABEL maintainer "Jimmy Zelinskie <jimmyzelinskie+git@gmail.com>"
# Install OS-level dependencies. # Install OS-level dependencies.
RUN apk update && \ RUN apk update && \
apk add curl git && \ apk add curl git
curl https://glide.sh/get | sh
# Copy our source code into the container. # Copy our source code into the container.
WORKDIR /go/src/github.com/chihaya/chihaya WORKDIR /go/src/github.com/chihaya/chihaya
COPY . /go/src/github.com/chihaya/chihaya COPY . /go/src/github.com/chihaya/chihaya
# Install our golang dependencies and compile our binary. # Install our golang dependencies and compile our binary.
RUN glide install RUN go get -u github.com/golang/dep/...
RUN CGO_ENABLED=0 go install github.com/chihaya/chihaya/cmd/chihaya RUN dep ensure
RUN CGO_ENABLED=0 go install github.com/chihaya/chihaya/cmd/...
FROM alpine:latest FROM alpine:latest
COPY --from=build-env /go/bin/chihaya /chihaya COPY --from=build-env /go/bin/chihaya /chihaya

View file

@ -77,18 +77,18 @@ $ $GOPATH/bin/chihaya --help
#### Reproducible Builds #### Reproducible Builds
Reproducible builds are handled by using [glide] to vendor dependencies. Reproducible builds are handled by using [dep] to vendor dependencies.
```sh ```sh
$ mkdir chihaya && export GOPATH=$PWD/chihaya $ mkdir chihaya && export GOPATH=$PWD/chihaya
$ git clone git@github.com:chihaya/chihaya.git $GOPATH/src/github.com/chihaya/chihaya $ git clone git@github.com:chihaya/chihaya.git $GOPATH/src/github.com/chihaya/chihaya
$ cd $GOPATH/src/github.com/chihaya/chihaya $ cd $GOPATH/src/github.com/chihaya/chihaya
$ glide install $ dep ensure
$ go install github.com/chihaya/chihaya/cmd/... $ go install github.com/chihaya/chihaya/cmd/...
$ $GOPATH/bin/chihaya --help $ $GOPATH/bin/chihaya --help
``` ```
[glide]: https://glide.sh [dep]: https://github.com/golang/dep
#### Docker #### Docker
@ -103,7 +103,7 @@ The following will run all tests and benchmarks.
Removing `-bench` will just run unit tests. Removing `-bench` will just run unit tests.
```sh ```sh
$ go test -bench $(glide novendor | grep -v contrib) $ go test -bench $(go list ./...)
``` ```
### Contributing ### Contributing