hugo

commit 9ccc958ce7d563fe344c310da37284548ac3a70a
parent 30e471b8c66f43b2505ba4a303b5cacb4a5f3af3
Author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date:   Sat, 21 Oct 2017 16:41:45 +0200

Update Dockerfile and Snap build to reflect move to dep

See #3988

Diffstat:
M
Dockerfile
 | 
5
++---
M
snapcraft.yaml
 | 
2
+-

2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/Dockerfile b/Dockerfile
@@ -1,11 +1,10 @@
 FROM golang:1.9.0-alpine3.6 AS build
 
 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
-RUN govendor sync
+RUN dep ensure
 ADD . /go/src/github.com/gohugoio/hugo/
 RUN go install -ldflags '-s -w'
 
diff --git a/snapcraft.yaml b/snapcraft.yaml
@@ -31,7 +31,7 @@ parts:
       go get github.com/magefile/mage
       mage vendor
       mage test
-      rm -f $GOPATH/bin/govendor
+      rm -f $GOPATH/bin/dep
       rm -f $GOPATH/bin/mage
     install: |
       strip --remove-section=.comment --remove-section=.note $SNAPCRAFT_PART_INSTALL/bin/hugo