Skip to content

Commit

Permalink
feat: accept docker daemon host via flag (#171)
Browse files Browse the repository at this point in the history
* feat: accept docker daemon host via flag
Fixes #170

Signed-off-by: Batuhan Apaydın <batuhan.apaydin@trendyol.com>
Co-authored-by: Furkan Türkal <furkan.turkal@trendyol.com>
Signed-off-by: Batuhan Apaydın <batuhan.apaydin@trendyol.com>

* feat: add default unix sock to host

Signed-off-by: Batuhan Apaydın <batuhan.apaydin@trendyol.com>

Co-authored-by: Furkan Türkal <furkan.turkal@trendyol.com>
  • Loading branch information
developer-guy and Dentrax committed Feb 16, 2022
1 parent a4295a7 commit ed3312a
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 0 deletions.
16 changes: 16 additions & 0 deletions cmd/dockle/main.go
@@ -1,6 +1,7 @@
package main

import (
"fmt"
l "log"
"os"
"time"
Expand Down Expand Up @@ -35,6 +36,15 @@ OPTIONS:
{{end}}{{$option}}{{end}}{{end}}
`
app := cli.NewApp()

var dockerSockPath string
xdgRuntimeDir := os.Getenv("XDG_RUNTIME_DIR")
if xdgRuntimeDir != "" {
dockerSockPath = fmt.Sprintf("unix://%s/docker.sock", xdgRuntimeDir)
} else {
dockerSockPath = "unix:///var/run/docker.sock"
}

app.Name = "dockle"
app.Version = version
app.ArgsUsage = "image_name"
Expand Down Expand Up @@ -106,6 +116,12 @@ OPTIONS:
EnvVar: "DOCKLE_TIMEOUT",
Usage: "docker timeout. e.g) 5s, 5m...",
},
cli.StringFlag{
Name: "host",
EnvVar: "DOCKLE_HOST",
Usage: "docker daemon host",
Value: dockerSockPath,
},
cli.StringFlag{
Name: "authurl",
EnvVar: "DOCKLE_AUTH_URL",
Expand Down
1 change: 1 addition & 0 deletions pkg/run.go
Expand Up @@ -59,6 +59,7 @@ func Run(c *cli.Context) (err error) {
UserName: c.String("username"),
Password: c.String("password"),
InsecureSkipTLSVerify: c.Bool("insecure"),
DockerDaemonHost: c.String("host"),
SkipPing: true,
}
var imageName string
Expand Down

0 comments on commit ed3312a

Please sign in to comment.