From 7492095dd1cfed7f4b85a1ee801adfb43348ebf1 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Mon, 28 Dec 2020 02:39:08 +0100 Subject: [PATCH 1/3] configurable listen address --- main.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/main.go b/main.go index d0cb9dc..1e51bfd 100644 --- a/main.go +++ b/main.go @@ -22,6 +22,10 @@ func main() { if !ok { log.Fatalf("unable to read CONTAINER_NAME") } + listen, ok := os.LookupEnv("LISTEN") + if !ok { + listen = ":8080" + } defaultHeaders := map[string]string{"User-Agent": "engine-api-cli-1.0"} cli, err := client.NewClient("unix:///var/run/docker.sock", "v1.44", nil, defaultHeaders) @@ -38,7 +42,7 @@ func main() { go counter.Scan(logs) http.HandleFunc("/", counter.MetricsHandler) - err = http.ListenAndServe(":8080", nil) + err = http.ListenAndServe(listen, nil) log.Fatalf("unable to listen: %s", err) } From 9785bd983b00b82886b68592198c667cedd08fb0 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Mon, 28 Dec 2020 02:39:33 +0100 Subject: [PATCH 2/3] use api version 1.40 (debian) --- main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.go b/main.go index 1e51bfd..f3f7bc2 100644 --- a/main.go +++ b/main.go @@ -28,7 +28,7 @@ func main() { } defaultHeaders := map[string]string{"User-Agent": "engine-api-cli-1.0"} - cli, err := client.NewClient("unix:///var/run/docker.sock", "v1.44", nil, defaultHeaders) + cli, err := client.NewClient("unix:///var/run/docker.sock", "v1.40", nil, defaultHeaders) if err != nil { log.Fatalf("unread: %s", err) } From bfa35c8640e926088159249a099ed5fea4d2690e Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Mon, 28 Dec 2020 02:39:56 +0100 Subject: [PATCH 3/3] get stdout logs --- main.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/main.go b/main.go index f3f7bc2..7637e32 100644 --- a/main.go +++ b/main.go @@ -32,7 +32,9 @@ func main() { if err != nil { log.Fatalf("unread: %s", err) } - logs, err := cli.ContainerLogs(context.TODO(), containerName, types.ContainerLogsOptions{}) + logs, err := cli.ContainerLogs(context.TODO(), containerName, types.ContainerLogsOptions{ + ShowStdout: true, + }) if err != nil { log.Fatalf("unread: %s", err) }