mirror of
https://github.com/bcicen/ctop.git
synced 2025-12-06 23:26:45 +08:00
move dockerhost into global config
This commit is contained in:
10
config.go
10
config.go
@@ -1,13 +1,23 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
)
|
||||||
|
|
||||||
type Config struct {
|
type Config struct {
|
||||||
|
dockerHost string
|
||||||
sortField string
|
sortField string
|
||||||
}
|
}
|
||||||
|
|
||||||
var DefaultConfig = NewDefaultConfig()
|
var DefaultConfig = NewDefaultConfig()
|
||||||
|
|
||||||
func NewDefaultConfig() Config {
|
func NewDefaultConfig() Config {
|
||||||
|
docker := os.Getenv("DOCKER_HOST")
|
||||||
|
if docker == "" {
|
||||||
|
docker = "unix:///var/run/docker.sock"
|
||||||
|
}
|
||||||
return Config{
|
return Config{
|
||||||
|
dockerHost: docker,
|
||||||
sortField: "id",
|
sortField: "id",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"os"
|
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/fsouza/go-dockerclient"
|
"github.com/fsouza/go-dockerclient"
|
||||||
@@ -12,18 +11,16 @@ var filters = map[string][]string{
|
|||||||
}
|
}
|
||||||
|
|
||||||
func NewContainerMap() *ContainerMap {
|
func NewContainerMap() *ContainerMap {
|
||||||
|
config := DefaultConfig
|
||||||
|
|
||||||
// init docker client
|
// init docker client
|
||||||
host := os.Getenv("DOCKER_HOST")
|
client, err := docker.NewClient(config.dockerHost)
|
||||||
if host == "" {
|
|
||||||
host = "unix:///var/run/docker.sock"
|
|
||||||
}
|
|
||||||
client, err := docker.NewClient(host)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
cm := &ContainerMap{
|
cm := &ContainerMap{
|
||||||
config: DefaultConfig,
|
config: config,
|
||||||
client: client,
|
client: client,
|
||||||
containers: make(map[string]*Container),
|
containers: make(map[string]*Container),
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user