From e6adce48b98d07c3bb122b2139f1dee462a78df5 Mon Sep 17 00:00:00 2001
From: dogsheng <960055655@qq.com>
Date: Fri, 13 Dec 2019 15:30:17 +0800
Subject: [PATCH] Package init

---
 Makefile                       | 4 ++--
 hack/isulad-lxcfs-toolkit.spec | 1 -
 hooks/lxcfs-hook/execmount.go  | 2 +-
 hooks/lxcfs-hook/main.go       | 2 +-
 libmount/container_work.go     | 2 +-
 libmount/libmount.go           | 2 +-
 remountcmd.go                  | 3 +--
 umountcmd.go                   | 3 +--
 8 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 81788ee..4629bbb 100644
--- a/Makefile
+++ b/Makefile
@@ -30,12 +30,12 @@ local: toolkit lxcfs-hook
 
 toolkit:  $(SOURCES) | $(DEPS_LINK)
 	@echo "Making isulad-lxcfs-tools..."
-	${ENV} go build -tags ${TAGS} -ldflags ${GO_LDFLAGS} -o build/isulad-lxcfs-toolkit .
+	${ENV} go build -mod=vendor -tags ${TAGS} -ldflags ${GO_LDFLAGS} -o build/isulad-lxcfs-toolkit .
 	@echo "Done!"
 
 lxcfs-hook: $(SOURCES) | $(DEPS_LINK)
 	@echo "Making lxcfs-hook..."
-	${ENV} go build -tags ${TAGS} -ldflags ${GO_LDFLAGS} -o build/lxcfs-hook ./hooks/lxcfs-hook
+	${ENV} go build -mod=vendor -tags ${TAGS} -ldflags ${GO_LDFLAGS} -o build/lxcfs-hook ./hooks/lxcfs-hook
 	@echo "Done!"
 
 clean:
diff --git a/hack/isulad-lxcfs-toolkit.spec b/hack/isulad-lxcfs-toolkit.spec
index 790c052..301f791 100644
--- a/hack/isulad-lxcfs-toolkit.spec
+++ b/hack/isulad-lxcfs-toolkit.spec
@@ -30,7 +30,6 @@ gzip -dc $RPM_BUILD_SOURCE/%{name}.tar.gz | tar -xvvf -
 
 %build
 cd $RPM_BUILD_DIR/src/isula.org/isulad-lxcfs-toolkit
-export GOPATH=%_topdir/BUILD
 make
 
 %install
diff --git a/hooks/lxcfs-hook/execmount.go b/hooks/lxcfs-hook/execmount.go
index 9f52778..1aec5df 100644
--- a/hooks/lxcfs-hook/execmount.go
+++ b/hooks/lxcfs-hook/execmount.go
@@ -17,7 +17,7 @@ package main
 import (
 	"fmt"
 	"io/ioutil"
-	"isula.org/isulad-lxcfs-toolkit/libmount"
+	"isulad-lxcfs-toolkit/libmount"
 	"os"
 	"strconv"
 
diff --git a/hooks/lxcfs-hook/main.go b/hooks/lxcfs-hook/main.go
index 06d5434..f4225c9 100644
--- a/hooks/lxcfs-hook/main.go
+++ b/hooks/lxcfs-hook/main.go
@@ -17,7 +17,7 @@ package main
 import (
 	"flag"
 	"fmt"
-	"isula.org/isulad-lxcfs-toolkit/hooks/lxcfs-hook/utils"
+	"isulad-lxcfs-toolkit/hooks/lxcfs-hook/utils"
 	"os"
 
 	"github.com/docker/docker/pkg/reexec"
diff --git a/libmount/container_work.go b/libmount/container_work.go
index a493f0e..8d57b31 100644
--- a/libmount/container_work.go
+++ b/libmount/container_work.go
@@ -16,7 +16,7 @@ package libmount
 import (
 	"encoding/json"
 	"fmt"
-	"isula.org/isulad-lxcfs-toolkit/libmount/nsexec"
+	"isulad-lxcfs-toolkit/libmount/nsexec"
 	"os"
 	"strconv"
 	"strings"
diff --git a/libmount/libmount.go b/libmount/libmount.go
index faa20b7..b49c39f 100644
--- a/libmount/libmount.go
+++ b/libmount/libmount.go
@@ -14,7 +14,7 @@
 package libmount
 
 import (
-	"isula.org/isulad-lxcfs-toolkit/libmount/nsexec"
+	"isulad-lxcfs-toolkit/libmount/nsexec"
 )
 
 // NsExecMount exec mount in container namespace
diff --git a/remountcmd.go b/remountcmd.go
index 808c135..d3395e5 100644
--- a/remountcmd.go
+++ b/remountcmd.go
@@ -19,6 +19,7 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
+	"isulad-lxcfs-toolkit/libmount"
 	"os"
 	"os/exec"
 	"strings"
@@ -26,8 +27,6 @@ import (
 	"syscall"
 	"time"
 
-	"isula.org/isulad-lxcfs-toolkit/libmount"
-
 	isulad_lxcfs_log "github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/umountcmd.go b/umountcmd.go
index 357412b..a5b72a9 100644
--- a/umountcmd.go
+++ b/umountcmd.go
@@ -17,13 +17,12 @@ package main
 import (
 	"fmt"
 	"io/ioutil"
+	"isulad-lxcfs-toolkit/libmount"
 	"os"
 	"strings"
 	"sync"
 	"time"
 
-	"isula.org/isulad-lxcfs-toolkit/libmount"
-
 	isulad_lxcfs_log "github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )