From 711caeabaf8cdf9f1cd369d54c0df198a654fb28 Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Sun, 1 Dec 2019 18:46:15 +0000
Subject: [PATCH] Use docker client InspectContainerWithOptions()
Instead of the deprecated form InspectContainer().
---
main.go | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/main.go b/main.go
index e3860f5..2ce347f 100644
--- a/main.go
+++ b/main.go
@@ -159,7 +159,8 @@ func lookupNamedContainer(c *Context) error {
return err
}
- container, err := client.InspectContainer(c.Name)
+ container, err := client.InspectContainerWithOptions(
+ dockerClient.InspectContainerOptions{ID: c.Name})
if _, ok := err.(*dockerClient.NoSuchContainer); ok {
return nil
}
@@ -186,7 +187,8 @@ func lookupNamedContainer(c *Context) error {
return err
}
- container, err = client.InspectContainer(c.Name)
+ container, err = client.InspectContainerWithOptions(
+ dockerClient.InspectContainerOptions{ID: c.Name})
if err != nil {
return err
}
@@ -291,9 +293,9 @@ func getContainerPid(c *Context) (int, error) {
return 0, fmt.Errorf("Failed to find container %s", c.Id)
}
- if container.State.Pid <= 0 {
- return 0, fmt.Errorf("Pid is %d for container %s: %+v", container.State.Pid, c.Id, container.State)
- }
+ // if container.State.Pid <= 0 {
+ // return 0, fmt.Errorf("Pid is %d for container %s: %+v", container.State.Pid, c.Id, container.State)
+ // }
return container.State.Pid, nil
}
--
GitLab