diff --git a/Dockerfile b/Dockerfile index c1aa64f..ceb3d4e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -FROM quay.io/vektorcloud/go:1.8 +FROM quay.io/vektorcloud/go:1.9 RUN apk add --no-cache make -COPY glide.* /go/src/github.com/bcicen/ctop/ +COPY Gopkg.* /go/src/github.com/bcicen/ctop/ WORKDIR /go/src/github.com/bcicen/ctop/ -RUN glide install +RUN dep ensure -vendor-only COPY . /go/src/github.com/bcicen/ctop RUN make build && \ diff --git a/Gopkg.lock b/Gopkg.lock new file mode 100644 index 0000000..8e32827 --- /dev/null +++ b/Gopkg.lock @@ -0,0 +1,159 @@ +# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. + + +[[projects]] + name = "github.com/Azure/go-ansiterm" + packages = [".","winterm"] + revision = "fa152c58bc15761d0200cb75fe958b89a9d4888e" + +[[projects]] + name = "github.com/Microsoft/go-winio" + packages = ["."] + revision = "fff283ad5116362ca252298cfc9b95828956d85d" + version = "v0.3.8" + +[[projects]] + branch = "master" + name = "github.com/Nvveen/Gotty" + packages = ["."] + revision = "cd527374f1e5bff4938207604a14f2e38a9cf512" + +[[projects]] + name = "github.com/Sirupsen/logrus" + packages = ["."] + revision = "26709e2714106fb8ad40b773b711ebce25b78914" + +[[projects]] + name = "github.com/c9s/goprocinfo" + packages = ["linux"] + revision = "b34328d6e0cd139894ea7347d2624ccf31fa3c58" + +[[projects]] + name = "github.com/coreos/go-systemd" + packages = ["dbus","util"] + revision = "b4a58d95188dd092ae20072bac14cece0e67c388" + version = "v4" + +[[projects]] + name = "github.com/docker/docker" + packages = ["api/types","api/types/blkiodev","api/types/container","api/types/filters","api/types/mount","api/types/network","api/types/registry","api/types/strslice","api/types/swarm","api/types/versions","opts","pkg/archive","pkg/fileutils","pkg/homedir","pkg/idtools","pkg/ioutils","pkg/jsonlog","pkg/jsonmessage","pkg/longpath","pkg/mount","pkg/pools","pkg/promise","pkg/stdcopy","pkg/symlink","pkg/system","pkg/term","pkg/term/windows"] + revision = "90d35abf7b3535c1c319c872900fbd76374e521c" + version = "v17.05.0-ce-rc3" + +[[projects]] + name = "github.com/docker/go-connections" + packages = ["nat"] + revision = "a2afab9802043837035592f1c24827fb70766de9" + +[[projects]] + branch = "master" + name = "github.com/docker/go-units" + packages = ["."] + revision = "0dadbb0345b35ec7ef35e228dabb8de89a65bf52" + +[[projects]] + name = "github.com/fsouza/go-dockerclient" + packages = ["."] + revision = "318513eb1ab27495afbc67f671ba1080513d8aa0" + +[[projects]] + branch = "barchart-numfmt" + name = "github.com/gizak/termui" + packages = ["."] + revision = "ea10e6ccee219e572ffad0ac1909f1a17f6db7d6" + source = "https://github.com/bcicen/termui" + +[[projects]] + name = "github.com/godbus/dbus" + packages = ["."] + revision = "c7fdd8b5cd55e87b4e1f4e372cdb1db61dd6c66f" + version = "v3" + +[[projects]] + branch = "master" + name = "github.com/golang/protobuf" + packages = ["proto"] + revision = "0a4f71a498b7c4812f64969510bcb4eca251e33a" + +[[projects]] + branch = "master" + name = "github.com/hashicorp/go-cleanhttp" + packages = ["."] + revision = "3573b8b52aa7b37b9358d966a898feb387f62437" + +[[projects]] + branch = "master" + name = "github.com/jgautheron/codename-generator" + packages = ["."] + revision = "16d037c7cc3c9b552fe4af9828b7338d752dbaf9" + +[[projects]] + name = "github.com/maruel/panicparse" + packages = ["stack"] + revision = "25bcac0d793cf4109483505a0d66e066a3a90a80" + +[[projects]] + name = "github.com/mattn/go-runewidth" + packages = ["."] + revision = "14207d285c6c197daabb5c9793d63e7af9ab2d50" + +[[projects]] + branch = "master" + name = "github.com/mitchellh/go-wordwrap" + packages = ["."] + revision = "ad45545899c7b13c020ea92b2072220eefad42b8" + +[[projects]] + name = "github.com/nsf/termbox-go" + packages = ["."] + revision = "91bae1bb5fa9ee504905ecbe7043fa30e92feaa3" + +[[projects]] + branch = "master" + name = "github.com/nu7hatch/gouuid" + packages = ["."] + revision = "179d4d0c4d8d407a32af483c2354df1d2c91e6c3" + +[[projects]] + name = "github.com/op/go-logging" + packages = ["."] + revision = "b2cb9fa56473e98db8caba80237377e83fe44db5" + version = "v1" + +[[projects]] + name = "github.com/opencontainers/runc" + packages = ["libcontainer","libcontainer/apparmor","libcontainer/cgroups","libcontainer/cgroups/fs","libcontainer/cgroups/systemd","libcontainer/configs","libcontainer/configs/validate","libcontainer/criurpc","libcontainer/keys","libcontainer/label","libcontainer/seccomp","libcontainer/selinux","libcontainer/stacktrace","libcontainer/system","libcontainer/user","libcontainer/utils"] + revision = "baf6536d6259209c3edfa2b22237af82942d3dfa" + version = "v0.1.1" + +[[projects]] + name = "github.com/seccomp/libseccomp-golang" + packages = ["."] + revision = "1b506fc7c24eec5a3693cdcbed40d9c226cfc6a1" + +[[projects]] + name = "github.com/syndtr/gocapability" + packages = ["capability"] + revision = "2c00daeb6c3b45114c80ac44119e7b8801fdd852" + +[[projects]] + name = "github.com/vishvananda/netlink" + packages = [".","nl"] + revision = "1e2e08e8a2dcdacaae3f14ac44c5cfa31361f270" + +[[projects]] + name = "golang.org/x/net" + packages = ["context","context/ctxhttp"] + revision = "a6577fac2d73be281a500b310739095313165611" + +[[projects]] + name = "golang.org/x/sys" + packages = ["unix","windows"] + revision = "99f16d856c9836c42d24e7ab64ea72916925fa97" + +[solve-meta] + analyzer-name = "dep" + analyzer-version = 1 + inputs-digest = "cf4dacc32111b22d72ac23189b826c8316ec265e55bf987338c7a00633af788e" + solver-name = "gps-cdcl" + solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml new file mode 100644 index 0000000..ff5dd69 --- /dev/null +++ b/Gopkg.toml @@ -0,0 +1,47 @@ + +# Gopkg.toml example +# +# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md +# for detailed Gopkg.toml documentation. +# +# required = ["github.com/user/thing/cmd/thing"] +# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] +# +# [[constraint]] +# name = "github.com/user/project" +# version = "1.0.0" +# +# [[constraint]] +# name = "github.com/user/project2" +# branch = "dev" +# source = "github.com/myfork/project2" +# +# [[override]] +# name = "github.com/x/y" +# version = "2.4.0" + + +[[constraint]] + name = "github.com/fsouza/go-dockerclient" + revision = "318513eb1ab27495afbc67f671ba1080513d8aa0" + +[[constraint]] + branch = "barchart-numfmt" + name = "github.com/gizak/termui" + source = "https://github.com/bcicen/termui" + +[[constraint]] + branch = "master" + name = "github.com/jgautheron/codename-generator" + +[[constraint]] + branch = "master" + name = "github.com/nu7hatch/gouuid" + +[[constraint]] + name = "github.com/op/go-logging" + version = "1.0.0" + +[[constraint]] + name = "github.com/opencontainers/runc" + version = "0.1.1" diff --git a/Makefile b/Makefile index bc1c54d..0290486 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ clean: rm -rf _build/ release/ build: - glide install + dep ensure CGO_ENABLED=0 go build -tags release -ldflags $(LD_FLAGS) -o ctop build-dev: diff --git a/glide.lock b/glide.lock deleted file mode 100644 index 6b2cba4..0000000 --- a/glide.lock +++ /dev/null @@ -1,129 +0,0 @@ -hash: 0d550b01b3a1c4751a8f5c3fba0c43f62252055e231712729628e514bb494da8 -updated: 2017-06-09T18:11:10.930196504-03:00 -imports: -- name: github.com/Azure/go-ansiterm - version: fa152c58bc15761d0200cb75fe958b89a9d4888e - subpackages: - - winterm -- name: github.com/c9s/goprocinfo - version: b34328d6e0cd139894ea7347d2624ccf31fa3c58 - subpackages: - - linux -- name: github.com/coreos/go-systemd - version: b4a58d95188dd092ae20072bac14cece0e67c388 - subpackages: - - activation - - dbus - - util -- name: github.com/docker/docker - version: 90d35abf7b3535c1c319c872900fbd76374e521c - subpackages: - - api/types - - api/types/blkiodev - - api/types/container - - api/types/filters - - api/types/mount - - api/types/network - - api/types/registry - - api/types/strslice - - api/types/swarm - - api/types/versions - - opts - - pkg/archive - - pkg/fileutils - - pkg/homedir - - pkg/idtools - - pkg/ioutils - - pkg/jsonlog - - pkg/jsonmessage - - pkg/longpath - - pkg/mount - - pkg/pools - - pkg/promise - - pkg/stdcopy - - pkg/symlink - - pkg/system - - pkg/term - - pkg/term/windows -- name: github.com/docker/go-connections - version: a2afab9802043837035592f1c24827fb70766de9 - subpackages: - - nat -- name: github.com/docker/go-units - version: 0dadbb0345b35ec7ef35e228dabb8de89a65bf52 -- name: github.com/fsouza/go-dockerclient - version: 318513eb1ab27495afbc67f671ba1080513d8aa0 -- name: github.com/gizak/termui - version: ea10e6ccee219e572ffad0ac1909f1a17f6db7d6 - repo: https://github.com/bcicen/termui - vcs: git -- name: github.com/godbus/dbus - version: c7fdd8b5cd55e87b4e1f4e372cdb1db61dd6c66f -- name: github.com/golang/protobuf - version: f7137ae6b19afbfd61a94b746fda3b3fe0491874 - subpackages: - - proto -- name: github.com/hashicorp/go-cleanhttp - version: 3573b8b52aa7b37b9358d966a898feb387f62437 -- name: github.com/jgautheron/codename-generator - version: 16d037c7cc3c9b552fe4af9828b7338d752dbaf9 -- name: github.com/maruel/panicparse - version: 25bcac0d793cf4109483505a0d66e066a3a90a80 - subpackages: - - stack -- name: github.com/mattn/go-runewidth - version: 14207d285c6c197daabb5c9793d63e7af9ab2d50 -- name: github.com/Microsoft/go-winio - version: fff283ad5116362ca252298cfc9b95828956d85d -- name: github.com/mitchellh/go-wordwrap - version: ad45545899c7b13c020ea92b2072220eefad42b8 -- name: github.com/nsf/termbox-go - version: 91bae1bb5fa9ee504905ecbe7043fa30e92feaa3 -- name: github.com/nu7hatch/gouuid - version: 179d4d0c4d8d407a32af483c2354df1d2c91e6c3 -- name: github.com/Nvveen/Gotty - version: cd527374f1e5bff4938207604a14f2e38a9cf512 -- name: github.com/op/go-logging - version: b2cb9fa56473e98db8caba80237377e83fe44db5 -- name: github.com/opencontainers/runc - version: baf6536d6259209c3edfa2b22237af82942d3dfa - subpackages: - - libcontainer - - libcontainer/apparmor - - libcontainer/cgroups - - libcontainer/cgroups/fs - - libcontainer/cgroups/systemd - - libcontainer/configs - - libcontainer/configs/validate - - libcontainer/criurpc - - libcontainer/keys - - libcontainer/label - - libcontainer/seccomp - - libcontainer/selinux - - libcontainer/stacktrace - - libcontainer/system - - libcontainer/user - - libcontainer/utils -- name: github.com/seccomp/libseccomp-golang - version: 1b506fc7c24eec5a3693cdcbed40d9c226cfc6a1 -- name: github.com/Sirupsen/logrus - version: 26709e2714106fb8ad40b773b711ebce25b78914 -- name: github.com/syndtr/gocapability - version: 2c00daeb6c3b45114c80ac44119e7b8801fdd852 - subpackages: - - capability -- name: github.com/vishvananda/netlink - version: 1e2e08e8a2dcdacaae3f14ac44c5cfa31361f270 - subpackages: - - nl -- name: golang.org/x/net - version: a6577fac2d73be281a500b310739095313165611 - subpackages: - - context - - context/ctxhttp -- name: golang.org/x/sys - version: 99f16d856c9836c42d24e7ab64ea72916925fa97 - subpackages: - - unix - - windows -testImports: [] diff --git a/glide.yaml b/glide.yaml deleted file mode 100644 index e58d1f3..0000000 --- a/glide.yaml +++ /dev/null @@ -1,18 +0,0 @@ -package: github.com/bcicen/ctop -import: -- package: github.com/c9s/goprocinfo/linux -- package: github.com/docker/docker - version: ^17.5.0-ce-rc3 -- package: github.com/opencontainers/runc - version: 0.1.1 -- package: github.com/fsouza/go-dockerclient - version: 318513eb1ab27495afbc67f671ba1080513d8aa0 -- package: github.com/gizak/termui - version: barchart-numfmt - repo: https://github.com/bcicen/termui - vcs: git -- package: github.com/jgautheron/codename-generator -- package: github.com/nu7hatch/gouuid -- package: github.com/c9s/goprocinfo/linux -- package: github.com/op/go-logging - version: ^1.0.0