diff --git a/Magefile.go b/Magefile.go index 3ac8cb9..6cc97f5 100644 --- a/Magefile.go +++ b/Magefile.go @@ -1,3 +1,4 @@ +//go:build mage // +build mage package main @@ -20,29 +21,6 @@ func init() { NetName = "none" } -func ModTidy() { - Bash(`sudo docker run -ti --rm \ - -h host \ - --net=bridge \ - -v /etc/localtime:/etc/localtime:ro \ - -v ` + GolangVolume + `:/usr/local/go:ro \ - \ - -v /d1/d/gopath/_data:/gopath:rw \ - -v ${PWD}:/app \ - \ - -e GOPATH=/gopath \ - -e HOME=/home/user \ - \ - -w /app \ - -u 1000 \ - \ - --entrypoint=/usr/local/go/bin/go \ - \ - \ - ` + ImageName + " " + - `mod tidy`) -} - func Test() { mg.Deps(TestLib) } @@ -53,11 +31,10 @@ func TestLib() { -v /etc/localtime:/etc/localtime:ro \ -v ` + GolangVolume + `:/usr/local/go:ro \ \ - -v /d1/d/gopath/_data:/gopath:rw \ + -v /gopath:/gopath:rw \ -v ${PWD}:/app \ \ -e GOPATH=/gopath \ - -e HOME=/home/user \ \ -w /app \ -u 1000 \ diff --git a/go.mod b/go.mod index a7d4d1c..db9fc56 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module my/goconf go 1.16 require ( - github.com/magefile/mage v1.11.0 + github.com/magefile/mage v1.14.0 github.com/onsi/ginkgo v1.16.2 github.com/onsi/gomega v1.13.0 ) diff --git a/go.sum b/go.sum index 679e899..65d81bd 100644 --- a/go.sum +++ b/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/magefile/mage v1.11.0 h1:C/55Ywp9BpgVVclD3lRnSYCwXTYxmSppIgLeDYlNuls= github.com/magefile/mage v1.11.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= +github.com/magefile/mage v1.14.0 h1:6QDX3g6z1YvJ4olPhT1wksUcSa/V0a1B+pJb73fBjyo= +github.com/magefile/mage v1.14.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=