diff --git a/Dockerfile b/Dockerfile index 0f0abbb..bbdc2d5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------ -from mcluseau/golang-builder:1.15.1 as build +from mcluseau/golang-builder:1.17.3 as build # ------------------------------------------------------------------------ from debian:stretch diff --git a/go.mod b/go.mod index 10b7ac2..2580f8a 100644 --- a/go.mod +++ b/go.mod @@ -1,5 +1,7 @@ module novit.nc/direktil/local-server +go 1.17 + require ( github.com/cavaliercoder/go-cpio v0.0.0-20180626203310-925f9528c45e github.com/cespare/xxhash v1.1.0 @@ -7,18 +9,10 @@ require ( github.com/dustin/go-humanize v1.0.0 github.com/emicklei/go-restful v2.10.0+incompatible github.com/emicklei/go-restful-openapi v1.2.0 - github.com/frankban/quicktest v1.5.0 // indirect - github.com/go-openapi/jsonreference v0.19.3 // indirect - github.com/go-openapi/spec v0.19.3 // indirect - github.com/google/certificate-transparency-go v1.0.21 // indirect - github.com/mailru/easyjson v0.7.0 // indirect github.com/mcluseau/go-swagger-ui v0.0.0-20191019002626-fd9128c24a34 github.com/miolini/datacounter v1.0.1 github.com/oklog/ulid v1.3.1 github.com/pierrec/lz4 v2.3.0+incompatible - golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 // indirect - golang.org/x/net v0.0.0-20191014212845-da9a3fd4c582 // indirect - golang.org/x/sys v0.0.0-20191018095205-727590c5006e // indirect gopkg.in/src-d/go-billy.v4 v4.3.2 gopkg.in/src-d/go-git.v4 v4.13.1 gopkg.in/yaml.v2 v2.2.4 @@ -26,4 +20,36 @@ require ( novit.nc/direktil/pkg v0.0.0-20191211161950-96b0448b84c2 ) -go 1.13 +require ( + github.com/PuerkitoBio/purell v1.1.1 // indirect + github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect + github.com/emirpasic/gods v1.12.0 // indirect + github.com/frankban/quicktest v1.5.0 // indirect + github.com/go-openapi/jsonpointer v0.19.3 // indirect + github.com/go-openapi/jsonreference v0.19.3 // indirect + github.com/go-openapi/spec v0.19.3 // indirect + github.com/go-openapi/swag v0.19.5 // indirect + github.com/gobuffalo/envy v1.7.1 // indirect + github.com/gobuffalo/packd v0.3.0 // indirect + github.com/gobuffalo/packr v1.30.1 // indirect + github.com/golang/protobuf v1.3.2 // indirect + github.com/google/certificate-transparency-go v1.0.21 // indirect + github.com/google/go-cmp v0.3.1 // indirect + github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect + github.com/joho/godotenv v1.3.0 // indirect + github.com/json-iterator/go v1.1.8 // indirect + github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect + github.com/mailru/easyjson v0.7.0 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.1 // indirect + github.com/rogpeppe/go-internal v1.5.0 // indirect + github.com/sergi/go-diff v1.0.0 // indirect + github.com/src-d/gcfg v1.4.0 // indirect + github.com/xanzy/ssh-agent v0.2.1 // indirect + golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 // indirect + golang.org/x/net v0.0.0-20191014212845-da9a3fd4c582 // indirect + golang.org/x/sys v0.0.0-20191018095205-727590c5006e // indirect + golang.org/x/text v0.3.2 // indirect + gopkg.in/warnings.v0 v0.1.2 // indirect +) diff --git a/go.sum b/go.sum index 0cb215c..27642e4 100644 --- a/go.sum +++ b/go.sum @@ -44,7 +44,6 @@ github.com/emicklei/go-restful-openapi v1.2.0/go.mod h1:cy7o3Ge8ZWZ5E90mpEY81sJZ github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg= github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/frankban/quicktest v1.5.0 h1:Tb4jWdSpdjKzTUicPnY61PZxKbDoGa7ABbrReT3gQVY= github.com/frankban/quicktest v1.5.0/go.mod h1:jaStnuzAqU1AJdCO0l53JDCJrVDKcS03DbaAcR7Ks/o= diff --git a/modd.conf b/modd.conf index 7ac93a8..ac11251 100644 --- a/modd.conf +++ b/modd.conf @@ -1,6 +1,6 @@ **/*.go go.mod go.sum Dockerfile { prep: go test ./... - prep: go install ./cmd/... + prep: go install -trimpath ./cmd/... prep: docker build --build-arg GOPROXY=$GOPROXY -t dls . #daemon +sigterm: /var/lib/direktil/test-run }