From 665e8fdd06b419c032c39cea8377d00ebdfe0b94 Mon Sep 17 00:00:00 2001 From: Bradley Cicenas Date: Sat, 1 Dec 2018 17:50:47 +0000 Subject: [PATCH] move to go module --- Dockerfile | 10 ++-- Gopkg.lock | 165 ----------------------------------------------------- Gopkg.toml | 51 ----------------- Makefile | 2 +- go.mod | 41 +++++++++++++ 5 files changed, 47 insertions(+), 222 deletions(-) delete mode 100644 Gopkg.lock delete mode 100644 Gopkg.toml create mode 100644 go.mod diff --git a/Dockerfile b/Dockerfile index f1d2b87..4617766 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ -FROM quay.io/vektorcloud/go:1.10 +FROM quay.io/vektorcloud/go:1.11 RUN apk add --no-cache make -COPY Gopkg.* /go/src/github.com/bcicen/ctop/ -WORKDIR /go/src/github.com/bcicen/ctop/ -RUN dep ensure -vendor-only +WORKDIR /app +COPY go.mod . +RUN go mod download -COPY . /go/src/github.com/bcicen/ctop +COPY . . RUN make build && \ mkdir -p /go/bin && \ mv -v ctop /go/bin/ diff --git a/Gopkg.lock b/Gopkg.lock deleted file mode 100644 index 8d7a4ce..0000000 --- a/Gopkg.lock +++ /dev/null @@ -1,165 +0,0 @@ -# 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/BurntSushi/toml" - packages = ["."] - revision = "b26d9c308763d68093482582cea63d69be07a0f0" - version = "v0.3.0" - -[[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 = "master" - name = "github.com/gizak/termui" - packages = ["."] - revision = "cdc199d7ea432fd8187db35f0247285d6f5b0267" - 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 = "e2050e41c8847748ec5288741c0b19a8cb26d084" - -[[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 = "a21d4c707f08f26de894adbdd00d5d6e82a54f5e0f52566229dd2da9b94e26ec" - solver-name = "gps-cdcl" - solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml deleted file mode 100644 index a33fc75..0000000 --- a/Gopkg.toml +++ /dev/null @@ -1,51 +0,0 @@ - -# 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 = "master" - 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" - -[[constraint]] - name = "github.com/Microsoft/go-winio" - version = "0.3.8" diff --git a/Makefile b/Makefile index b850419..43d0172 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ clean: rm -rf _build/ release/ build: - dep ensure + go mod download CGO_ENABLED=0 go build -tags release -ldflags $(LD_FLAGS) -o ctop build-dev: diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..4921cba --- /dev/null +++ b/go.mod @@ -0,0 +1,41 @@ +module github.com/bcicen/ctop + +require ( + github.com/Azure/go-ansiterm v0.0.0-20160622173216-fa152c58bc15 // indirect + github.com/BurntSushi/toml v0.3.0 + github.com/Microsoft/go-winio v0.3.8 // indirect + github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect + github.com/Sirupsen/logrus v0.0.0-20150423025312-26709e271410 // indirect + github.com/c9s/goprocinfo v0.0.0-20170609001544-b34328d6e0cd + github.com/coreos/go-systemd v0.0.0-20151104194251-b4a58d95188d // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/docker/docker v0.0.0-20170502054910-90d35abf7b35 // indirect + github.com/docker/go-connections v0.0.0-20170301234100-a2afab980204 // indirect + github.com/docker/go-units v0.3.2 // indirect + github.com/fsouza/go-dockerclient v0.0.0-20170307141636-318513eb1ab2 + github.com/gizak/termui v2.3.0+incompatible + github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55 // indirect + github.com/golang/protobuf v0.0.0-20170712042213-0a4f71a498b7 // indirect + github.com/hashicorp/go-cleanhttp v0.0.0-20170211013415-3573b8b52aa7 // indirect + github.com/jgautheron/codename-generator v0.0.0-20150829203204-16d037c7cc3c + github.com/kr/pretty v0.1.0 // indirect + github.com/maruel/panicparse v0.0.0-20170227222818-25bcac0d793c // indirect + github.com/maruel/ut v1.0.0 // indirect + github.com/mattn/go-runewidth v0.0.0-20170201023540-14207d285c6c // indirect + github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 // indirect + github.com/nsf/termbox-go v0.0.0-20180303152453-e2050e41c884 + github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d + github.com/op/go-logging v0.0.0-20160211212156-b2cb9fa56473 + github.com/opencontainers/runc v0.1.1 + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/seccomp/libseccomp-golang v0.0.0-20150813023252-1b506fc7c24e // indirect + github.com/stretchr/testify v1.2.2 // indirect + github.com/syndtr/gocapability v0.0.0-20150716010906-2c00daeb6c3b // indirect + github.com/vishvananda/netlink v0.0.0-20150820014904-1e2e08e8a2dc // indirect + github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc // indirect + golang.org/x/net v0.0.0-20170308210134-a6577fac2d73 // indirect + golang.org/x/sync v0.0.0-20181108010431-42b317875d0f // indirect + golang.org/x/sys v0.0.0-20170308153327-99f16d856c98 // indirect +) + +replace github.com/gizak/termui => github.com/bcicen/termui v0.0.0-20180326052246-4eb80249d3f5