Update with recent changes to magnet (#2539)

Makefile.buildx

@@ -37,6 +37,9 @@ WORMHOLE_IMG ?= quay.io/gravitational/wormhole:0.3.3
 SELINUX_VERSION := 6.0.0
 SELINUX_REPO := git@github.com:a-palchikov/selinux.git
 SELINUX_BRANCH := dmitri/buildx
+#TODO(dima): update once the https://github.com/gravitational/selinux/pull/16 has been merged
+#SELINUX_REPO := git@github.com:gravitational/selinux.git
+#SELINUX_BRANCH := distro/centos_rhel/7
 
 # Set to non-empty value to trigger streaming builder progress
 CI ?=

build.go

@@ -19,8 +19,11 @@ limitations under the License.
 package main
 
 import (
-	// mage:import
+	//mage:import
 	"github.com/gravitational/gravity/mage"
+
+	//mage:import
+	_ "github.com/gravitational/magnet/common"
 )
 
 // Default specifies the default build target

go.mod

@@ -47,7 +47,7 @@ require (
 	github.com/gravitational/go-vhost v0.0.0-20171024163855-94d0c42e3263
 	github.com/gravitational/kingpin v2.1.11-0.20160205192003-785686550a08+incompatible // indirect
 	github.com/gravitational/license v0.0.0-20171013193735-f3111b1818ce
-	github.com/gravitational/magnet v0.2.6
+	github.com/gravitational/magnet v0.2.7-0.20210609203954-0a59f53f530e
 	github.com/gravitational/oxy v0.0.0-20180629203109-e4a7e35311e6 // indirect
 	github.com/gravitational/rigging v0.0.0-20210330165731-4602e892394d
 	github.com/gravitational/roundtrip v1.0.0
@@ -146,14 +146,13 @@ replace (
 	github.com/google/uuid => github.com/google/uuid v1.1.0
 	github.com/gophercloud/gophercloud => github.com/gophercloud/gophercloud v0.0.0-20181207171349-d3bcea3cf97e
 	github.com/gorilla/mux => github.com/gorilla/mux v1.7.0
-	github.com/gravitational/magnet => github.com/a-palchikov/magnet v0.2.7-0.20210520113349-2a5f8ce635ab
 	github.com/imdario/mergo => github.com/imdario/mergo v0.0.0-20160517064435-50d4dbd4eb0e
 	github.com/jaguilar/vt100 => github.com/tonistiigi/vt100 v0.0.0-20190402012908-ad4c4a574305
 	github.com/json-iterator/go => github.com/json-iterator/go v1.1.5
 	github.com/julienschmidt/httprouter => github.com/julienschmidt/httprouter v1.1.0
 	github.com/kr/pty => github.com/kr/pty v1.0.0
 	github.com/kylelemons/godebug => github.com/kylelemons/godebug v0.0.0-20160406211939-eadb3ce320cb
-	github.com/magefile/mage => github.com/a-palchikov/mage v1.9.1-0.20210510142914-0614fcadda0b
+	github.com/magefile/mage => github.com/knisbet/mage v1.9.1-0.20210609142646-749a704341ac
 	github.com/mattn/go-isatty => github.com/mattn/go-isatty v0.0.3
 	github.com/mattn/go-runewidth => github.com/mattn/go-runewidth v0.0.2-0.20161012013512-737072b4e32b
 	github.com/miekg/dns => github.com/miekg/dns v1.0.4

go.sum

@@ -95,10 +95,6 @@ github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:H
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
 github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
-github.com/a-palchikov/mage v1.9.1-0.20210510142914-0614fcadda0b h1:4zD3qgA1LWkxwXN2p8U6set5w5ZIAWWlDy78CTb2FIg=
-github.com/a-palchikov/mage v1.9.1-0.20210510142914-0614fcadda0b/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
-github.com/a-palchikov/magnet v0.2.7-0.20210520113349-2a5f8ce635ab h1:8ZTjoU8XFETBN/LHo3ELgdRPLeMzKdoiQ+VrqoseR1I=
-github.com/a-palchikov/magnet v0.2.7-0.20210520113349-2a5f8ce635ab/go.mod h1:I168G8xokpoH32modDL8a0Ht2MWQyU+DCfcc6q+bVIQ=
 github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
 github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
 github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
@@ -551,6 +547,8 @@ github.com/gravitational/log v0.0.0-20200127200505-fdffa14162b0 h1:gxT3g2wRixRJ2
 github.com/gravitational/log v0.0.0-20200127200505-fdffa14162b0/go.mod h1:zJJqcfDBGf9G5qdBzs0Ai3FDwIvmvzl16nlClqcJyy4=
 github.com/gravitational/logrus v1.4.3 h1:gdyMN/zLd4R/kATybKzG1I6gjrbCqNJOl1XiixdT5e4=
 github.com/gravitational/logrus v1.4.3/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo=
+github.com/gravitational/magnet v0.2.7-0.20210609203954-0a59f53f530e h1:yDDoKxGE9kpId7555BP1IgjikZFLX2h/6yA3MomGMDw=
+github.com/gravitational/magnet v0.2.7-0.20210609203954-0a59f53f530e/go.mod h1:1hC1lZ075A/syd4/xlrq5eVAGzleRcnDG9xegcxZ7Ts=
 github.com/gravitational/moby v1.4.2-0.20191008111026-2adf434ca696 h1:GI3Wyc/dLHL8snw18nLrSWTyKqMHF+pB8APFw0bQe3I=
 github.com/gravitational/moby v1.4.2-0.20191008111026-2adf434ca696/go.mod h1:bDzK0jA4s+TisyeqAiirQQULXKzSLYhmAd3NHeVgaHs=
 github.com/gravitational/oxy v0.0.0-20180629203109-e4a7e35311e6 h1:244Hc0XnOrqZxR0Fbwt9nwlvM5HnqKWJE+r5EdG6v4A=
@@ -707,6 +705,8 @@ github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod h1:Pj4uuM52
 github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg=
 github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
+github.com/knisbet/mage v1.9.1-0.20210609142646-749a704341ac h1:MOsgxjsdw6rKsxuCKmS8RIVLLPwDctvC1leKhYPl9cE=
+github.com/knisbet/mage v1.9.1-0.20210609142646-749a704341ac/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=

mage/misc.go

@@ -42,15 +42,6 @@ func Clean() (err error) {
 	return trace.Wrap(os.RemoveAll(root.buildDir))
 }
 
-// Env outputs the list of imported environment variables
-func Env() (err error) {
-	for k, v := range root.Config.ImportEnv {
-		fmt.Println(k, ":", v)
-	}
-
-	return
-}
-
 // IsUpToDate returns true iff all of the (source, sources...) are older or the same
 // age as dst.
 func IsUpToDate(dst string, source string, sources ...string) (uptodate bool) {