summaryrefslogtreecommitdiff
path: root/pkg/api
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-10-06 13:17:15 +0200
committerGitHub <noreply@github.com>2020-10-06 13:17:15 +0200
commitdefb754945b3f99c1d786dac95d9b17b24f55e59 (patch)
tree3ec5cd697deb7babf9db415ebb0081fbfa1569ab /pkg/api
parent80a2317ca20b0e5e1cd064a8962beed642be3a36 (diff)
parentadde67c74f265c2f4c9245b975d531dd635dce8e (diff)
downloadpodman-defb754945b3f99c1d786dac95d9b17b24f55e59.tar.gz
podman-defb754945b3f99c1d786dac95d9b17b24f55e59.tar.bz2
podman-defb754945b3f99c1d786dac95d9b17b24f55e59.zip
Merge pull request #7918 from zhangguanzhang/apiv2-wrong-StopSignal
[apiv2] /containers/$name/json return wrong value in `.Config.StopSignal`
Diffstat (limited to 'pkg/api')
-rw-r--r--pkg/api/handlers/compat/containers.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/api/handlers/compat/containers.go b/pkg/api/handlers/compat/containers.go
index 95499c6a2..48ecfff5d 100644
--- a/pkg/api/handlers/compat/containers.go
+++ b/pkg/api/handlers/compat/containers.go
@@ -4,6 +4,7 @@ import (
"encoding/json"
"fmt"
"net/http"
+ "strconv"
"strings"
"syscall"
@@ -385,7 +386,7 @@ func LibpodToContainerJSON(l *libpod.Container, sz bool) (*types.ContainerJSON,
MacAddress: "",
OnBuild: nil,
Labels: l.Labels(),
- StopSignal: string(l.StopSignal()),
+ StopSignal: strconv.Itoa(int(l.StopSignal())),
StopTimeout: &stopTimeout,
Shell: nil,
}