From e9d1e71276e0bf5bdd2f281ab916d1dc8fa54761 Mon Sep 17 00:00:00 2001 From: Jimmy Zelinskie Date: Fri, 29 Dec 2017 17:12:17 -0500 Subject: [PATCH] *: remove glide from README & Dockerfile --- Dockerfile | 10 +++++----- README.md | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4f7ba20..e9854f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,18 @@ FROM golang:alpine AS build-env -LABEL maintainer "Jimmy Zelinskie " +LABEL maintainer "Jimmy Zelinskie " # Install OS-level dependencies. RUN apk update && \ - apk add curl git && \ - curl https://glide.sh/get | sh + apk add curl git # Copy our source code into the container. WORKDIR /go/src/github.com/chihaya/chihaya COPY . /go/src/github.com/chihaya/chihaya # Install our golang dependencies and compile our binary. -RUN glide install -RUN CGO_ENABLED=0 go install github.com/chihaya/chihaya/cmd/chihaya +RUN go get -u github.com/golang/dep/... +RUN dep ensure +RUN CGO_ENABLED=0 go install github.com/chihaya/chihaya/cmd/... FROM alpine:latest COPY --from=build-env /go/bin/chihaya /chihaya diff --git a/README.md b/README.md index caa8aca..fe05b74 100644 --- a/README.md +++ b/README.md @@ -77,18 +77,18 @@ $ $GOPATH/bin/chihaya --help #### Reproducible Builds -Reproducible builds are handled by using [glide] to vendor dependencies. +Reproducible builds are handled by using [dep] to vendor dependencies. ```sh $ mkdir chihaya && export GOPATH=$PWD/chihaya $ git clone git@github.com:chihaya/chihaya.git $GOPATH/src/github.com/chihaya/chihaya $ cd $GOPATH/src/github.com/chihaya/chihaya -$ glide install +$ dep ensure $ go install github.com/chihaya/chihaya/cmd/... $ $GOPATH/bin/chihaya --help ``` -[glide]: https://glide.sh +[dep]: https://github.com/golang/dep #### Docker @@ -103,7 +103,7 @@ The following will run all tests and benchmarks. Removing `-bench` will just run unit tests. ```sh -$ go test -bench $(glide novendor | grep -v contrib) +$ go test -bench $(go list ./...) ``` ### Contributing