Update Dockerfile and Snap build to reflect move to dep

See #3988

diff --git a/Dockerfile b/Dockerfile
index e0da7d83401161aef85ebb4438a94956da7830b5..889584b616be422a57456764a4afc90c4927dfb5 100644 (file)
--- 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
index c9481078fda2788abd8140923b0b98a6defaec70..68ba7aba359616d0a6b7bcceeb52afefe8676c2e 100644 (file)
--- 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