Bump github.com/docker/docker

Bumps [github.com/docker/docker](https://github.com/docker/docker) from 20.10.0-beta1.0.20201113105859-b6bfff2a628f+incompatible to 20.10.24+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](https://github.com/docker/docker/commits/v20.10.24) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
Merge pull request #296 from utix/patch-1
2025-12-06 15:16:41 +08:00 · 2023-04-04 21:13:16 +00:00 · 2022-08-01 06:32:57 -05:00 · 2022-08-01 06:24:33 -05:00 · 2022-08-01 06:23:25 -05:00 · 2022-08-01 07:21:06 -04:00
6 changed files with 36 additions and 22 deletions
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM quay.io/vektorcloud/go:1.15
+FROM quay.io/vektorcloud/go:1.18

 RUN apk add --no-cache make

--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@

 #

-![release][release] ![homebrew][homebrew] ![macports][macports]
+![release][release] ![homebrew][homebrew] ![macports][macports] ![scoop][scoop]

 Top-like interface for container metrics

@@ -21,15 +21,23 @@ Fetch the [latest release](https://github.com/bcicen/ctop/releases) for your pla

 Maintained by a [third party](https://packages.azlux.fr/)
 ```bash
-echo "deb http://packages.azlux.fr/debian/ buster main" | sudo tee /etc/apt/sources.list.d/azlux.list
-wget -qO - https://azlux.fr/repo.gpg.key | sudo apt-key add -
-sudo apt update
-sudo apt install docker-ctop
+sudo apt-get install ca-certificates curl gnupg lsb-release
+curl -fsSL https://azlux.fr/repo.gpg.key | sudo gpg --dearmor -o /usr/share/keyrings/azlux-archive-keyring.gpg
+echo \
+  "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/azlux-archive-keyring.gpg] http://packages.azlux.fr/debian \
+  $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/azlux.list >/dev/null
+sudo apt-get update
+sudo apt-get install docker-ctop
 ```

 #### Arch

-`ctop` is available for Arch in the [AUR](https://aur.archlinux.org/packages/ctop-bin/)
+```bash
+sudo pacman -S ctop
+```
+
+_`ctop` is also available for Arch in the [AUR](https://aur.archlinux.org/packages/ctop-bin/)_
+

 #### Linux (Generic)

@@ -53,6 +61,14 @@ sudo curl -Lo /usr/local/bin/ctop https://github.com/bcicen/ctop/releases/downlo
 sudo chmod +x /usr/local/bin/ctop
 ```

+#### Windows
+
+`ctop` is available in [scoop](https://scoop.sh/):
+
+```powershell
+scoop install ctop
+```
+
 #### Docker

 ```bash
@@ -112,6 +128,7 @@ Option | Description
 [release]: https://img.shields.io/github/release/bcicen/ctop.svg "ctop"
 [homebrew]: https://img.shields.io/homebrew/v/ctop.svg "ctop"
 [macports]: https://repology.org/badge/version-for-repo/macports/ctop.svg?header=macports "ctop"
+[scoop]: https://img.shields.io/scoop/v/ctop?bucket=main "ctop"

 ## Alternatives

--- a/connector/docker.go
+++ b/connector/docker.go
@@ -7,6 +7,7 @@ import (
 	"time"

 	"github.com/op/go-logging"
+	"github.com/hako/durafmt"

 	"github.com/bcicen/ctop/connector/collector"
 	"github.com/bcicen/ctop/connector/manager"
@@ -187,7 +188,7 @@ func (cm *Docker) refresh(c *container.Container) {
 	if webPort != "" {
 		c.SetMeta("Web Port", webPort)
 	}
-	c.SetMeta("created", insp.Created.Format("Mon Jan 2 15:04:05 2006"))
+	c.SetMeta("created", insp.Created.Format("Mon Jan 02 15:04:05 2006"))
 	c.SetMeta("uptime", calcUptime(insp))
 	c.SetMeta("health", insp.State.Health.Status)
 	c.SetMeta("[ENV-VAR]", strings.Join(insp.Config.Env, ";"))
@@ -209,11 +210,11 @@ func (cm *Docker) inspect(id string) (insp *api.Container, found bool, failed bo

 func calcUptime(insp *api.Container) string {
 	endTime := insp.State.FinishedAt
-	if endTime.IsZero() {
+	if endTime.IsZero() || insp.State.Running {
 		endTime = time.Now()
 	}
 	uptime := endTime.Sub(insp.State.StartedAt)
-	return uptime.Truncate(time.Second).String()
+	return durafmt.Parse(uptime).LimitFirstN(1).String()
 }

 // Mark all container IDs for refresh
--- a/cwidgets/compact/status.go
+++ b/cwidgets/compact/status.go
@@ -54,7 +54,7 @@ func (s *Status) setState(val string) {
 	case "created":
 		mark = "◉"
 	case "running":
-		mark = "⏵"
+		mark = "▶"
 		color = ui.ThemeAttr("status.ok")
 	case "exited":
 		mark = "⏹"
--- a/go.mod
+++ b/go.mod
@@ -5,6 +5,7 @@ require (
 	github.com/c9s/goprocinfo v0.0.0-20170609001544-b34328d6e0cd
 	github.com/fsouza/go-dockerclient v1.7.0
 	github.com/gizak/termui v2.3.1-0.20180817033724-8d4faad06196+incompatible
+	github.com/hako/durafmt v0.0.0-20210608085754-5c1018a4e16b
 	github.com/jgautheron/codename-generator v0.0.0-20150829203204-16d037c7cc3c
 	github.com/mattn/go-runewidth v0.0.2
 	github.com/nsf/termbox-go v0.0.0-20190121233118-02980233997d
@@ -13,7 +14,6 @@ require (
 	github.com/opencontainers/runc v1.1.0
 	github.com/pkg/browser v0.0.0-20201207095918-0426ae3fba23
 	github.com/pkg/errors v0.9.1
-	github.com/stretchr/testify v1.4.0
 )

 require (
@@ -25,11 +25,9 @@ require (
 	github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59 // indirect
 	github.com/containerd/console v1.0.3 // indirect
 	github.com/containerd/containerd v1.4.1 // indirect
-	github.com/containerd/continuity v0.0.0-20200928162600-f2cc35102c2a // indirect
 	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.3 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/docker/docker v20.10.0-beta1.0.20201113105859-b6bfff2a628f+incompatible // indirect
+	github.com/docker/docker v20.10.24+incompatible // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-units v0.4.0 // indirect
 	github.com/godbus/dbus/v5 v5.0.6 // indirect
@@ -46,7 +44,6 @@ require (
 	github.com/opencontainers/image-spec v1.0.1 // indirect
 	github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect
 	github.com/opencontainers/selinux v1.10.0 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921 // indirect
 	github.com/sirupsen/logrus v1.8.1 // indirect
 	github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
@@ -54,10 +51,8 @@ require (
 	github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df // indirect
 	go.opencensus.io v0.22.0 // indirect
 	golang.org/x/net v0.0.0-20201224014010-6772e930b67b // indirect
-	golang.org/x/sync v0.0.0-20190423024810-112230192c58 // indirect
 	golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c // indirect
 	google.golang.org/protobuf v1.27.1 // indirect
-	gopkg.in/yaml.v2 v2.2.8 // indirect
 )

-go 1.17
+go 1.18
--- a/go.sum
+++ b/go.sum
@@ -44,8 +44,9 @@ github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/docker/docker v20.10.0-beta1.0.20201113105859-b6bfff2a628f+incompatible h1:lwpV3629md5omgAKjxPWX17shI7vMRpE3nyb9WHn8pA=
 github.com/docker/docker v20.10.0-beta1.0.20201113105859-b6bfff2a628f+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v20.10.24+incompatible h1:Ugvxm7a8+Gz6vqQYQQ2W7GYq5EUPaAiuPgIfVyI3dYE=
+github.com/docker/docker v20.10.24+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
@@ -78,6 +79,8 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
+github.com/hako/durafmt v0.0.0-20210608085754-5c1018a4e16b h1:wDUNC2eKiL35DbLvsDhiblTUXHxcOPwQSCzi7xpQUN4=
+github.com/hako/durafmt v0.0.0-20210608085754-5c1018a4e16b/go.mod h1:VzxiSdG6j1pi7rwGm/xYI5RbtpBgM8sARDXlvEvxlu0=
 github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
@@ -188,7 +191,6 @@ golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAG
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -240,7 +242,6 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
 google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
Author	SHA1	Message	Date
dependabot[bot]	99e093601d	Bump github.com/docker/docker Bumps [github.com/docker/docker](https://github.com/docker/docker) from 20.10.0-beta1.0.20201113105859-b6bfff2a628f+incompatible to 20.10.24+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](https://github.com/docker/docker/commits/v20.10.24) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2023-04-04 21:13:16 +00:00
bradley	59f00dd6aa	Merge pull request #296 from utix/patch-1 Fix running icon	2022-08-01 06:32:57 -05:00
bradley	06265407b2	Merge pull request #306 from jnishwanth/patch-1 updated README.md	2022-08-01 06:24:33 -05:00
bradley	a08150ea9c	Merge pull request #303 from wdiazux/master Fix apt-key is deprecated	2022-08-01 06:23:25 -05:00
Alex Stelmachonak	6bf41ea05f	Add Windows-specific intructions and badge for scoop (#295 )	2022-08-01 07:21:06 -04:00
Jeya Nishwanth	3dff9970ad	updated README.md `ctop` has been added to the arch community repository. Hence can be installed without the AUR now!	2022-06-12 03:07:41 +05:30
William Diaz	458ef62f80	Required packages to set up the repository	2022-05-21 23:06:07 -06:00
William Diaz	a821deb3b4	Fix apt-key is deprecated	2022-05-21 22:48:46 -06:00
Aurélien Lajoie	dacd3be920	Fix running icon Use ▶ for running status	2022-04-26 19:10:52 +02:00
Bradley Cicenas	222a7d77b2	Squashed commit of the following: commit `9968c504a5` Author: Florian Vahl <florian@flova.de> Date: Tue Feb 1 00:37:31 2022 +0100 Fix formating (Spaces -> Tabs) commit `6b8840647e` Author: Florian <florian@flova.de> Date: Tue Feb 1 00:27:44 2022 +0100 Use better duration formating commit `815dc6ec84` Author: Florian <florian@flova.de> Date: Tue Feb 1 00:27:04 2022 +0100 Fix date formating in 'created' col commit `05b17798f8` Author: Florian <florian@flova.de> Date: Tue Feb 1 00:26:08 2022 +0100 Add fix from #275 for uptime of running containers	2022-03-30 14:13:10 -04:00
Bradley Cicenas	9bc26c8296	update dockerfile base image -> go1.18	2022-03-24 08:14:39 -04:00
Bradley Cicenas	5271cf6d90	update go.mod go1.17 -> go1.18	2022-03-24 11:53:43 +00:00