3 files changed, 16 insertions, 20 deletions

diff --git a/pkg/specgen/generate/container.go b/pkg/specgen/generate/container.go
index b27dd1cc2..92a2b4d35 100644
--- a/pkg/specgen/generate/container.go
+++ b/pkg/specgen/generate/container.go
@@ -3,6 +3,7 @@ package generate
 import (
 	"context"
 
+	"github.com/containers/image/v5/manifest"
 	"github.com/containers/libpod/libpod"
 	ann "github.com/containers/libpod/pkg/annotations"
 	envLib "github.com/containers/libpod/pkg/env"
@@ -22,7 +23,12 @@ func CompleteSpec(ctx context.Context, r *libpod.Runtime, s *specgen.SpecGenerat
 		return err
 	}
 
-	if s.HealthConfig == nil {
+	_, mediaType, err := newImage.Manifest(ctx)
+	if err != nil {
+		return err
+	}
+
+	if s.HealthConfig == nil && mediaType == manifest.DockerV2Schema2MediaType {
 		s.HealthConfig, err = newImage.GetHealthCheck(ctx)
 		if err != nil {
 			return err
@@ -126,13 +132,6 @@ func CompleteSpec(ctx context.Context, r *libpod.Runtime, s *specgen.SpecGenerat
 		if err != nil {
 			return err
 		}
-
-		// TODO This should be enabled when namespaces actually work
-		//case usernsMode.IsKeepID():
-		//	user = fmt.Sprintf("%d:%d", rootless.GetRootlessUID(), rootless.GetRootlessGID())
-		if len(s.User) == 0 {
-			s.User = "0"
-		}
 	}
 	if err := finishThrottleDevices(s); err != nil {
 		return err
diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go
index bb84f0618..14836035d 100644
--- a/pkg/specgen/generate/container_create.go
+++ b/pkg/specgen/generate/container_create.go
@@ -24,11 +24,10 @@ func MakeContainer(ctx context.Context, rt *libpod.Runtime, s *specgen.SpecGener
 	// If joining a pod, retrieve the pod for use.
 	var pod *libpod.Pod
 	if s.Pod != "" {
-		foundPod, err := rt.LookupPod(s.Pod)
+		pod, err = rt.LookupPod(s.Pod)
 		if err != nil {
 			return nil, errors.Wrapf(err, "error retrieving pod %s", s.Pod)
 		}
-		pod = foundPod
 	}
 
 	// Set defaults for unset namespaces
@@ -76,6 +75,7 @@ func MakeContainer(ctx context.Context, rt *libpod.Runtime, s *specgen.SpecGener
 	}
 
 	options := []libpod.CtrCreateOption{}
+	options = append(options, libpod.WithCreateCommand())
 
 	var newImage *image.Image
 	if s.Rootfs != "" {
@@ -129,12 +129,8 @@ func createContainerOptions(rt *libpod.Runtime, s *specgen.SpecGenerator, pod *l
 		logrus.Debugf("setting container name %s", s.Name)
 		options = append(options, libpod.WithName(s.Name))
 	}
-	if s.Pod != "" {
-		pod, err := rt.LookupPod(s.Pod)
-		if err != nil {
-			return nil, err
-		}
-		logrus.Debugf("adding container to pod %s", s.Pod)
+	if pod != nil {
+		logrus.Debugf("adding container to pod %s", pod.Name())
 		options = append(options, rt.WithPod(pod))
 	}
 	destinations := []string{}
@@ -159,11 +155,12 @@ func createContainerOptions(rt *libpod.Runtime, s *specgen.SpecGenerator, pod *l
 		options = append(options, libpod.WithNamedVolumes(vols))
 	}
 
-	if len(s.Command) != 0 {
+	if s.Command != nil {
 		options = append(options, libpod.WithCommand(s.Command))
 	}
-
-	options = append(options, libpod.WithEntrypoint(s.Entrypoint))
+	if s.Entrypoint != nil {
+		options = append(options, libpod.WithEntrypoint(s.Entrypoint))
+	}
 	if s.StopSignal != nil {
 		options = append(options, libpod.WithStopSignal(*s.StopSignal))
 	}
diff --git a/pkg/specgen/generate/oci.go b/pkg/specgen/generate/oci.go
index f2292f500..7993777fb 100644
--- a/pkg/specgen/generate/oci.go
+++ b/pkg/specgen/generate/oci.go
@@ -89,7 +89,7 @@ func makeCommand(ctx context.Context, s *specgen.SpecGenerator, img *image.Image
 	finalCommand = append(finalCommand, entrypoint...)
 
 	command := s.Command
-	if len(command) == 0 && img != nil {
+	if command == nil && img != nil {
 		newCmd, err := img.Cmd(ctx)
 		if err != nil {
 			return nil, err