From a9243117ffaa0e487445917fb6b58a42901f30e5 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Thu, 22 Nov 2018 17:24:19 +0100 Subject: [PATCH] Update dependencies to blackfriday --- cmd/trello2mail/trello.go | 2 +- docker/Dockerfile | 5 ++--- go.mod | 2 +- go.sum | 6 ++---- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/cmd/trello2mail/trello.go b/cmd/trello2mail/trello.go index 2b18334..82c687b 100644 --- a/cmd/trello2mail/trello.go +++ b/cmd/trello2mail/trello.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" "github.com/adlio/trello" - "github.com/russross/blackfriday" + "github.com/russross/blackfriday/v2" // "gopkg.in/russross/blackfriday.v2" "log" "net/url" diff --git a/docker/Dockerfile b/docker/Dockerfile index 0c14d78..33ec8fc 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,6 @@ -FROM golang:1.10 AS build +FROM golang:1.11 AS build -RUN go mod download github.com/glenux/trello2mail \ - && go get github.com/glenux/trello2mail/... +RUN go get -v -d github.com/glenux/trello2mail/... WORKDIR /go/src/github.com/glenux/trello2mail RUN CGO_ENABLED=0 go build ./... diff --git a/go.mod b/go.mod index 4dfeb94..b44f038 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,6 @@ module github.com/glenux/trello2mail require ( github.com/adlio/trello v0.0.0-20180621142300-8a458717123e github.com/pkg/errors v0.8.0 // indirect - github.com/russross/blackfriday v2.0.0+incompatible + github.com/russross/blackfriday/v2 v2.0.1 github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95 // indirect ) diff --git a/go.sum b/go.sum index 18ceff6..026fde4 100644 --- a/go.sum +++ b/go.sum @@ -2,9 +2,7 @@ github.com/adlio/trello v0.0.0-20180621142300-8a458717123e h1:i5+hZJx4iTPT4+ojV5 github.com/adlio/trello v0.0.0-20180621142300-8a458717123e/go.mod h1:VjzhFGdnEJGih1AsIWi/yU6y01yZh0DuEWCNAyOJ1WE= github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/russross/blackfriday v2.0.0+incompatible h1:cBXrhZNUf9C+La9/YpS+UHpUT8YD6Td9ZMSU9APFcsk= -github.com/russross/blackfriday v2.0.0+incompatible/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95 h1:/vdW8Cb7EXrkqWGufVMES1OH2sU9gKVb2n9/1y5NMBY= github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -gopkg.in/russross/blackfriday.v2 v2.0.0 h1:+FlnIV8DSQnT7NZ43hcVKcdJdzZoeCmJj4Ql8gq5keA= -gopkg.in/russross/blackfriday.v2 v2.0.0/go.mod h1:6sSBNz/GtOm/pJTuh5UmBK2ZHfmnxGbl2NZg1UliSOI=