Package init

This commit is contained in:
dogsheng 2019-12-13 15:30:17 +08:00
parent cf1b898b3d
commit e6adce48b9
8 changed files with 8 additions and 11 deletions

View File

@ -30,12 +30,12 @@ local: toolkit lxcfs-hook
toolkit: $(SOURCES) | $(DEPS_LINK) toolkit: $(SOURCES) | $(DEPS_LINK)
@echo "Making isulad-lxcfs-tools..." @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!" @echo "Done!"
lxcfs-hook: $(SOURCES) | $(DEPS_LINK) lxcfs-hook: $(SOURCES) | $(DEPS_LINK)
@echo "Making lxcfs-hook..." @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!" @echo "Done!"
clean: clean:

View File

@ -30,7 +30,6 @@ gzip -dc $RPM_BUILD_SOURCE/%{name}.tar.gz | tar -xvvf -
%build %build
cd $RPM_BUILD_DIR/src/isula.org/isulad-lxcfs-toolkit cd $RPM_BUILD_DIR/src/isula.org/isulad-lxcfs-toolkit
export GOPATH=%_topdir/BUILD
make make
%install %install

View File

@ -17,7 +17,7 @@ package main
import ( import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"isula.org/isulad-lxcfs-toolkit/libmount" "isulad-lxcfs-toolkit/libmount"
"os" "os"
"strconv" "strconv"

View File

@ -17,7 +17,7 @@ package main
import ( import (
"flag" "flag"
"fmt" "fmt"
"isula.org/isulad-lxcfs-toolkit/hooks/lxcfs-hook/utils" "isulad-lxcfs-toolkit/hooks/lxcfs-hook/utils"
"os" "os"
"github.com/docker/docker/pkg/reexec" "github.com/docker/docker/pkg/reexec"

View File

@ -16,7 +16,7 @@ package libmount
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"isula.org/isulad-lxcfs-toolkit/libmount/nsexec" "isulad-lxcfs-toolkit/libmount/nsexec"
"os" "os"
"strconv" "strconv"
"strings" "strings"

View File

@ -14,7 +14,7 @@
package libmount package libmount
import ( import (
"isula.org/isulad-lxcfs-toolkit/libmount/nsexec" "isulad-lxcfs-toolkit/libmount/nsexec"
) )
// NsExecMount exec mount in container namespace // NsExecMount exec mount in container namespace

View File

@ -19,6 +19,7 @@ import (
"fmt" "fmt"
"io" "io"
"io/ioutil" "io/ioutil"
"isulad-lxcfs-toolkit/libmount"
"os" "os"
"os/exec" "os/exec"
"strings" "strings"
@ -26,8 +27,6 @@ import (
"syscall" "syscall"
"time" "time"
"isula.org/isulad-lxcfs-toolkit/libmount"
isulad_lxcfs_log "github.com/sirupsen/logrus" isulad_lxcfs_log "github.com/sirupsen/logrus"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

View File

@ -17,13 +17,12 @@ package main
import ( import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"isulad-lxcfs-toolkit/libmount"
"os" "os"
"strings" "strings"
"sync" "sync"
"time" "time"
"isula.org/isulad-lxcfs-toolkit/libmount"
isulad_lxcfs_log "github.com/sirupsen/logrus" isulad_lxcfs_log "github.com/sirupsen/logrus"
"github.com/urfave/cli" "github.com/urfave/cli"
) )