aboutsummaryrefslogtreecommitdiff
path: root/pkg/specgen/generate/container_create.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-08-11 15:44:55 +0000
committerGitHub <noreply@github.com>2022-08-11 15:44:55 +0000
commit92bbae40de3c48ee6b4692ab9e4d7cc14db242bb (patch)
tree89df1d0983bbb2c978e54e48d377f316e0b44485 /pkg/specgen/generate/container_create.go
parent7af523ea5af8ba8ad61cd4b81a1494a42ac7b479 (diff)
parent79e21b5b162d3c2d3fb274b20bfe180c15284893 (diff)
downloadpodman-92bbae40de3c48ee6b4692ab9e4d7cc14db242bb.tar.gz
podman-92bbae40de3c48ee6b4692ab9e4d7cc14db242bb.tar.bz2
podman-92bbae40de3c48ee6b4692ab9e4d7cc14db242bb.zip
Merge pull request #15248 from vrothberg/RUN-1606
kube play: sd-notify integration
Diffstat (limited to 'pkg/specgen/generate/container_create.go')
-rw-r--r--pkg/specgen/generate/container_create.go7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go
index 8334d386f..e9cec2873 100644
--- a/pkg/specgen/generate/container_create.go
+++ b/pkg/specgen/generate/container_create.go
@@ -5,6 +5,7 @@ import (
"encoding/json"
"errors"
"fmt"
+ "os"
"path/filepath"
"strings"
@@ -352,7 +353,13 @@ func createContainerOptions(rt *libpod.Runtime, s *specgen.SpecGenerator, pod *l
}
if len(s.SdNotifyMode) > 0 {
options = append(options, libpod.WithSdNotifyMode(s.SdNotifyMode))
+ if s.SdNotifyMode != define.SdNotifyModeIgnore {
+ if notify, ok := os.LookupEnv("NOTIFY_SOCKET"); ok {
+ options = append(options, libpod.WithSdNotifySocket(notify))
+ }
+ }
}
+
if pod != nil {
logrus.Debugf("adding container to pod %s", pod.Name())
options = append(options, rt.WithPod(pod))