summaryrefslogtreecommitdiff
path: root/pkg/domain
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-10-20 11:16:11 -0400
committerGitHub <noreply@github.com>2020-10-20 11:16:11 -0400
commit6c0b600e7d49d17db6eedd21b755b5d4f1a15b11 (patch)
treebacb719aef9c18e181d4014abb37d3a103f7a601 /pkg/domain
parent35b4cb196545eee3b072083e716ad4588e0bb486 (diff)
parentf58d2f5e75b4982774509847c18b39f4a50fd5be (diff)
downloadpodman-6c0b600e7d49d17db6eedd21b755b5d4f1a15b11.tar.gz
podman-6c0b600e7d49d17db6eedd21b755b5d4f1a15b11.tar.bz2
podman-6c0b600e7d49d17db6eedd21b755b5d4f1a15b11.zip
Merge pull request #7999 from mheon/signal_handler
Add a shutdown signal handler
Diffstat (limited to 'pkg/domain')
-rw-r--r--pkg/domain/infra/abi/terminal/sigproxy_linux.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/pkg/domain/infra/abi/terminal/sigproxy_linux.go b/pkg/domain/infra/abi/terminal/sigproxy_linux.go
index f484e926c..0c586cf5c 100644
--- a/pkg/domain/infra/abi/terminal/sigproxy_linux.go
+++ b/pkg/domain/infra/abi/terminal/sigproxy_linux.go
@@ -5,12 +5,17 @@ import (
"syscall"
"github.com/containers/podman/v2/libpod"
+ "github.com/containers/podman/v2/libpod/shutdown"
"github.com/containers/podman/v2/pkg/signal"
"github.com/sirupsen/logrus"
)
// ProxySignals ...
func ProxySignals(ctr *libpod.Container) {
+ // Stop catching the shutdown signals (SIGINT, SIGTERM) - they're going
+ // to the container now.
+ shutdown.Stop()
+
sigBuffer := make(chan os.Signal, 128)
signal.CatchAll(sigBuffer)