summaryrefslogtreecommitdiff
path: root/pkg/specgen/generate/container_create.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-07-13 13:20:26 +0200
committerGitHub <noreply@github.com>2020-07-13 13:20:26 +0200
commite2a8e037d1c3a2176cd15493812bf165faea63f2 (patch)
treee01065d69937d364a355441fd7df7fc90c8f0f37 /pkg/specgen/generate/container_create.go
parente38001f123a04f905a37bf038b2c983ebe350996 (diff)
parentc4627b5846ba16540dc61db91b059eb39555ec4a (diff)
downloadpodman-e2a8e037d1c3a2176cd15493812bf165faea63f2.tar.gz
podman-e2a8e037d1c3a2176cd15493812bf165faea63f2.tar.bz2
podman-e2a8e037d1c3a2176cd15493812bf165faea63f2.zip
Merge pull request #6896 from mheon/fix_remote_createcommand
Fix container and pod create commands for remote create
Diffstat (limited to 'pkg/specgen/generate/container_create.go')
-rw-r--r--pkg/specgen/generate/container_create.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go
index 8df5b996e..1bcd33672 100644
--- a/pkg/specgen/generate/container_create.go
+++ b/pkg/specgen/generate/container_create.go
@@ -78,7 +78,9 @@ func MakeContainer(ctx context.Context, rt *libpod.Runtime, s *specgen.SpecGener
}
options := []libpod.CtrCreateOption{}
- options = append(options, libpod.WithCreateCommand())
+ if s.ContainerCreateCommand != nil {
+ options = append(options, libpod.WithCreateCommand(s.ContainerCreateCommand))
+ }
var newImage *image.Image
if s.Rootfs != "" {