mirrors
/
ctop
mirror of https://github.com/bcicen/ctop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix merge conflict: env-var

This commit is contained in:
Sergey Ponomarev 2021-01-05 19:48:36 +02:00
parent cc43dbc84e
commit b591b46fba
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
connector/manager/docker.go
View File

@ -8,6 +8,7 @@ import (
"github.com/pkg/errors"
"io"
"os"
"strings"
)
var (
@ -133,9 +134,7 @@ func (dc *Docker) Inspect() (models.Meta, error) {
newMeta["ports"] = PortsFormat(insp.NetworkSettings.Ports)
newMeta["created"] = insp.Created.Format("Mon Jan 2 15:04:05 2006")
newMeta["health"] = insp.State.Health.Status
for _, env := range insp.Config.Env {
newMeta["[ENV-VAR]"] = env
}
newMeta["[ENV-VAR]"] = strings.Join(insp.Config.Env, ";")
newMeta["state"] = insp.State.Status
return newMeta, nil