Update Dockerfile and Snap build to reflect move to dep

See #3988
This commit is contained in:
Bjørn Erik Pedersen 2017-10-21 16:41:45 +02:00
parent 30e471b8c6
commit 9ccc958ce7
2 changed files with 3 additions and 4 deletions

View file

@ -1,11 +1,10 @@
FROM golang:1.9.0-alpine3.6 AS build FROM golang:1.9.0-alpine3.6 AS build
RUN apk add --no-cache --virtual git musl-dev RUN apk add --no-cache --virtual git musl-dev
RUN go get github.com/kardianos/govendor RUN go get github.com/golang/dep/cmd/dep
ADD vendor/vendor.json /go/src/github.com/gohugoio/hugo/vendor/vendor.json
WORKDIR /go/src/github.com/gohugoio/hugo WORKDIR /go/src/github.com/gohugoio/hugo
RUN govendor sync RUN dep ensure
ADD . /go/src/github.com/gohugoio/hugo/ ADD . /go/src/github.com/gohugoio/hugo/
RUN go install -ldflags '-s -w' RUN go install -ldflags '-s -w'

View file

@ -31,7 +31,7 @@ parts:
go get github.com/magefile/mage go get github.com/magefile/mage
mage vendor mage vendor
mage test mage test
rm -f $GOPATH/bin/govendor rm -f $GOPATH/bin/dep
rm -f $GOPATH/bin/mage rm -f $GOPATH/bin/mage
install: | install: |
strip --remove-section=.comment --remove-section=.note $SNAPCRAFT_PART_INSTALL/bin/hugo strip --remove-section=.comment --remove-section=.note $SNAPCRAFT_PART_INSTALL/bin/hugo