Merge pull request #6016 from giuseppe/fix-create

v2, podman: fix create and entrypoint tests

14 files changed, 96 insertions, 59 deletions

diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go
index a0aed984c..0f9476754 100644
--- a/cmd/podman/common/create.go
+++ b/cmd/podman/common/create.go
@@ -49,9 +49,7 @@ func GetCreateFlags(cf *ContainerCLIOpts) *pflag.FlagSet {
 		"cap-drop", []string{},
 		"Drop capabilities from the container",
 	)
-	cgroupNS := ""
-	createFlags.StringVar(
-		&cgroupNS,
+	createFlags.String(
 		"cgroupns", containerConfig.CgroupNS(),
 		"cgroup namespace to use",
 	)
@@ -155,9 +153,7 @@ func GetCreateFlags(cf *ContainerCLIOpts) *pflag.FlagSet {
 		"device-write-iops", []string{},
 		"Limit write rate (IO per second) to a device (e.g. --device-write-iops=/dev/sda:1000)",
 	)
-	createFlags.StringVar(
-		&cf.Entrypoint,
-		"entrypoint", "",
+	createFlags.String("entrypoint", "",
 		"Overwrite the default ENTRYPOINT of the image",
 	)
 	createFlags.StringArrayVarP(
@@ -248,9 +244,7 @@ func GetCreateFlags(cf *ContainerCLIOpts) *pflag.FlagSet {
 		"interactive", "i", false,
 		"Keep STDIN open even if not attached",
 	)
-	ipcNS := ""
-	createFlags.StringVar(
-		&ipcNS,
+	createFlags.String(
 		"ipc", containerConfig.IPCNS(),
 		"IPC namespace to use",
 	)
@@ -331,9 +325,7 @@ func GetCreateFlags(cf *ContainerCLIOpts) *pflag.FlagSet {
 		"use `OS` instead of the running OS for choosing images",
 	)
 	// markFlagHidden(createFlags, "override-os")
-	pid := ""
-	createFlags.StringVar(
-		&pid,
+	createFlags.String(
 		"pid", containerConfig.PidNS(),
 		"PID namespace to use",
 	)
@@ -397,9 +389,7 @@ func GetCreateFlags(cf *ContainerCLIOpts) *pflag.FlagSet {
 		"security-opt", containerConfig.SecurityOptions(),
 		"Security Options",
 	)
-	shmSize := ""
-	createFlags.StringVar(
-		&shmSize,
+	createFlags.String(
 		"shm-size", containerConfig.ShmSize(),
 		"Size of /dev/shm "+sizeWithUnitFormat,
 	)
@@ -464,15 +454,11 @@ func GetCreateFlags(cf *ContainerCLIOpts) *pflag.FlagSet {
 		"user", "u", "",
 		"Username or UID (format: <name|uid>[:<group|gid>])",
 	)
-	userNS := ""
-	createFlags.StringVar(
-		&userNS,
+	createFlags.String(
 		"userns", containerConfig.Containers.UserNS,
 		"User namespace to use",
 	)
-	utsNS := ""
-	createFlags.StringVar(
-		&utsNS,
+	createFlags.String(
 		"uts", containerConfig.Containers.UTSNS,
 		"UTS namespace to use",
 	)
diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go
index 2f08bb6a6..c275b1674 100644
--- a/cmd/podman/common/create_opts.go
+++ b/cmd/podman/common/create_opts.go
@@ -31,7 +31,7 @@ type ContainerCLIOpts struct {
 	DeviceReadIOPs    []string
 	DeviceWriteBPs    []string
 	DeviceWriteIOPs   []string
-	Entrypoint        string
+	Entrypoint        *string
 	env               []string
 	EnvHost           bool
 	EnvFile           []string
diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go
index 96cd630a3..7250f88bb 100644
--- a/cmd/podman/common/specgen.go
+++ b/cmd/podman/common/specgen.go
@@ -364,20 +364,20 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string
 	s.WorkDir = workDir
 	entrypoint := []string{}
 	userCommand := []string{}
-	if ep := c.Entrypoint; len(ep) > 0 {
-		// Check if entrypoint specified is json
-		if err := json.Unmarshal([]byte(c.Entrypoint), &entrypoint); err != nil {
-			entrypoint = append(entrypoint, ep)
+	if c.Entrypoint != nil {
+		if ep := *c.Entrypoint; len(ep) > 0 {
+			// Check if entrypoint specified is json
+			if err := json.Unmarshal([]byte(*c.Entrypoint), &entrypoint); err != nil {
+				entrypoint = append(entrypoint, ep)
+			}
 		}
+		s.Entrypoint = entrypoint
 	}
-
 	var command []string
 
-	s.Entrypoint = entrypoint
-
 	// Build the command
 	// If we have an entry point, it goes first
-	if len(entrypoint) > 0 {
+	if c.Entrypoint != nil {
 		command = entrypoint
 	}
 	if len(inputCommand) > 0 {
@@ -386,9 +386,12 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string
 		userCommand = append(userCommand, inputCommand...)
 	}
 
-	if len(inputCommand) > 0 {
+	switch {
+	case len(inputCommand) > 0:
 		s.Command = userCommand
-	} else {
+	case c.Entrypoint != nil:
+		s.Command = []string{}
+	default:
 		s.Command = command
 	}
 
diff --git a/cmd/podman/containers/create.go b/cmd/podman/containers/create.go
index f3f9d18f3..7927da04d 100644
--- a/cmd/podman/containers/create.go
+++ b/cmd/podman/containers/create.go
@@ -1,8 +1,10 @@
 package containers
 
 import (
+	"context"
 	"fmt"
 	"os"
+	"strings"
 
 	"github.com/containers/common/pkg/config"
 	"github.com/containers/libpod/cmd/podman/common"
@@ -106,6 +108,10 @@ func create(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
+	if _, err := createPodIfNecessary(s); err != nil {
+		return err
+	}
+
 	report, err := registry.ContainerEngine().ContainerCreate(registry.GetContext(), s)
 	if err != nil {
 		return err
@@ -160,6 +166,10 @@ func createInit(c *cobra.Command) error {
 	if c.Flag("cgroupns").Changed {
 		cliVals.CGroupsNS = c.Flag("cgroupns").Value.String()
 	}
+	if c.Flag("entrypoint").Changed {
+		val := c.Flag("entrypoint").Value.String()
+		cliVals.Entrypoint = &val
+	}
 
 	// Docker-compatibility: the "-h" flag for run/create is reserved for
 	// the hostname (see https://github.com/containers/libpod/issues/1367).
@@ -181,8 +191,10 @@ func pullImage(imageName string) error {
 			return errors.New("unable to find a name and tag match for busybox in repotags: no such image")
 		}
 		_, pullErr := registry.ImageEngine().Pull(registry.GetContext(), imageName, entities.ImagePullOptions{
-			Authfile: cliVals.Authfile,
-			Quiet:    cliVals.Quiet,
+			Authfile:     cliVals.Authfile,
+			Quiet:        cliVals.Quiet,
+			OverrideArch: cliVals.OverrideArch,
+			OverrideOS:   cliVals.OverrideOS,
 		})
 		if pullErr != nil {
 			return pullErr
@@ -204,3 +216,25 @@ func openCidFile(cidfile string) (*os.File, error) {
 	}
 	return cidFile, nil
 }
+
+// createPodIfNecessary automatically creates a pod when requested.  if the pod name
+// has the form new:ID, the pod ID is created and the name in the spec generator is replaced
+// with ID.
+func createPodIfNecessary(s *specgen.SpecGenerator) (*entities.PodCreateReport, error) {
+	if !strings.HasPrefix(s.Pod, "new:") {
+		return nil, nil
+	}
+	podName := strings.Replace(s.Pod, "new:", "", 1)
+	if len(podName) < 1 {
+		return nil, errors.Errorf("new pod name must be at least one character")
+	}
+	createOptions := entities.PodCreateOptions{
+		Name:  podName,
+		Infra: true,
+		Net: &entities.NetOptions{
+			PublishPorts: s.PortMappings,
+		},
+	}
+	s.Pod = podName
+	return registry.ContainerEngine().PodCreate(context.Background(), createOptions)
+}
diff --git a/cmd/podman/containers/run.go b/cmd/podman/containers/run.go
index 1e4d47b42..b13983e37 100644
--- a/cmd/podman/containers/run.go
+++ b/cmd/podman/containers/run.go
@@ -146,6 +146,10 @@ func run(cmd *cobra.Command, args []string) error {
 	}
 	runOpts.Spec = s
 
+	if _, err := createPodIfNecessary(s); err != nil {
+		return err
+	}
+
 	report, err := registry.ContainerEngine().ContainerRun(registry.GetContext(), runOpts)
 	// report.ExitCode is set by ContainerRun even it it returns an error
 	if report != nil {
diff --git a/cmd/podman/containers/start.go b/cmd/podman/containers/start.go
index 381bf8e26..ce78d24ed 100644
--- a/cmd/podman/containers/start.go
+++ b/cmd/podman/containers/start.go
@@ -99,7 +99,7 @@ func start(cmd *cobra.Command, args []string) error {
 
 	for _, r := range responses {
 		if r.Err == nil {
-			fmt.Println(r.Id)
+			fmt.Println(r.RawInput)
 		} else {
 			errs = append(errs, r.Err)
 		}
diff --git a/pkg/domain/entities/containers.go b/pkg/domain/entities/containers.go
index e58258b75..622e8eb5b 100644
--- a/pkg/domain/entities/containers.go
+++ b/pkg/domain/entities/containers.go
@@ -227,6 +227,7 @@ type ContainerStartOptions struct {
 // containers from the cli
 type ContainerStartReport struct {
 	Id       string
+	RawInput string
 	Err      error
 	ExitCode int
 }
diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go
index 82bf82bf0..f4996583a 100644
--- a/pkg/domain/infra/abi/containers.go
+++ b/pkg/domain/infra/abi/containers.go
@@ -32,9 +32,9 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-// getContainersByContext gets pods whether all, latest, or a slice of names/ids
-// is specified.
-func getContainersByContext(all, latest bool, names []string, runtime *libpod.Runtime) (ctrs []*libpod.Container, err error) {
+// getContainersAndInputByContext gets containers whether all, latest, or a slice of names/ids
+// is specified.  It also returns a list of the corresponding input name used to lookup each container.
+func getContainersAndInputByContext(all, latest bool, names []string, runtime *libpod.Runtime) (ctrs []*libpod.Container, rawInput []string, err error) {
 	var ctr *libpod.Container
 	ctrs = []*libpod.Container{}
 
@@ -43,6 +43,7 @@ func getContainersByContext(all, latest bool, names []string, runtime *libpod.Ru
 		ctrs, err = runtime.GetAllContainers()
 	case latest:
 		ctr, err = runtime.GetLatestContainer()
+		rawInput = append(rawInput, ctr.ID())
 		ctrs = append(ctrs, ctr)
 	default:
 		for _, n := range names {
@@ -54,6 +55,7 @@ func getContainersByContext(all, latest bool, names []string, runtime *libpod.Ru
 					err = e
 				}
 			} else {
+				rawInput = append(rawInput, n)
 				ctrs = append(ctrs, ctr)
 			}
 		}
@@ -61,6 +63,13 @@ func getContainersByContext(all, latest bool, names []string, runtime *libpod.Ru
 	return
 }
 
+// getContainersByContext gets containers whether all, latest, or a slice of names/ids
+// is specified.
+func getContainersByContext(all, latest bool, names []string, runtime *libpod.Runtime) (ctrs []*libpod.Container, err error) {
+	ctrs, _, err = getContainersAndInputByContext(all, latest, names, runtime)
+	return
+}
+
 // TODO: Should return *entities.ContainerExistsReport, error
 func (ic *ContainerEngine) ContainerExists(ctx context.Context, nameOrId string) (*entities.BoolReport, error) {
 	_, err := ic.Libpod.LookupContainer(nameOrId)
@@ -555,12 +564,14 @@ func (ic *ContainerEngine) ContainerExec(ctx context.Context, nameOrId string, o
 func (ic *ContainerEngine) ContainerStart(ctx context.Context, namesOrIds []string, options entities.ContainerStartOptions) ([]*entities.ContainerStartReport, error) {
 	var reports []*entities.ContainerStartReport
 	var exitCode = define.ExecErrorCodeGeneric
-	ctrs, err := getContainersByContext(false, options.Latest, namesOrIds, ic.Libpod)
+	ctrs, rawInputs, err := getContainersAndInputByContext(false, options.Latest, namesOrIds, ic.Libpod)
 	if err != nil {
 		return nil, err
 	}
 	// There can only be one container if attach was used
-	for _, ctr := range ctrs {
+	for i := range ctrs {
+		ctr := ctrs[i]
+		rawInput := rawInputs[i]
 		ctrState, err := ctr.State()
 		if err != nil {
 			return nil, err
@@ -574,6 +585,7 @@ func (ic *ContainerEngine) ContainerStart(ctx context.Context, namesOrIds []stri
 				// Exit cleanly immediately
 				reports = append(reports, &entities.ContainerStartReport{
 					Id:       ctr.ID(),
+					RawInput: rawInput,
 					Err:      nil,
 					ExitCode: 0,
 				})
@@ -584,6 +596,7 @@ func (ic *ContainerEngine) ContainerStart(ctx context.Context, namesOrIds []stri
 				logrus.Debugf("Deadlock error: %v", err)
 				reports = append(reports, &entities.ContainerStartReport{
 					Id:       ctr.ID(),
+					RawInput: rawInput,
 					Err:      err,
 					ExitCode: define.ExitCode(err),
 				})
@@ -593,6 +606,7 @@ func (ic *ContainerEngine) ContainerStart(ctx context.Context, namesOrIds []stri
 			if ctrRunning {
 				reports = append(reports, &entities.ContainerStartReport{
 					Id:       ctr.ID(),
+					RawInput: rawInput,
 					Err:      nil,
 					ExitCode: 0,
 				})
@@ -602,6 +616,7 @@ func (ic *ContainerEngine) ContainerStart(ctx context.Context, namesOrIds []stri
 			if err != nil {
 				reports = append(reports, &entities.ContainerStartReport{
 					Id:       ctr.ID(),
+					RawInput: rawInput,
 					Err:      err,
 					ExitCode: exitCode,
 				})
@@ -624,6 +639,7 @@ func (ic *ContainerEngine) ContainerStart(ctx context.Context, namesOrIds []stri
 			}
 			reports = append(reports, &entities.ContainerStartReport{
 				Id:       ctr.ID(),
+				RawInput: rawInput,
 				Err:      err,
 				ExitCode: exitCode,
 			})
@@ -636,6 +652,7 @@ func (ic *ContainerEngine) ContainerStart(ctx context.Context, namesOrIds []stri
 			// If the container is in a pod, also set to recursively start dependencies
 			report := &entities.ContainerStartReport{
 				Id:       ctr.ID(),
+				RawInput: rawInput,
 				ExitCode: 125,
 			}
 			if err := ctr.Start(ctx, ctr.PodID() != ""); err != nil {
diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go
index 01ddcf9c8..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
@@ -130,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{}
@@ -160,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 87262684e..f0b4d1111 100644
--- a/pkg/specgen/generate/oci.go
+++ b/pkg/specgen/generate/oci.go
@@ -67,7 +67,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
diff --git a/test/e2e/create_test.go b/test/e2e/create_test.go
index 82346823a..10742a0e8 100644
--- a/test/e2e/create_test.go
+++ b/test/e2e/create_test.go
@@ -18,7 +18,6 @@ var _ = Describe("Podman create", func() {
 	)
 
 	BeforeEach(func() {
-		Skip(v2fail)
 		tempdir, err = CreateTempDirInTempDir()
 		if err != nil {
 			os.Exit(1)
diff --git a/test/e2e/run_entrypoint_test.go b/test/e2e/run_entrypoint_test.go
index ebc06b36c..b1344a371 100644
--- a/test/e2e/run_entrypoint_test.go
+++ b/test/e2e/run_entrypoint_test.go
@@ -18,7 +18,6 @@ var _ = Describe("Podman run entrypoint", func() {
 	)
 
 	BeforeEach(func() {
-		Skip(v2fail)
 		tempdir, err = CreateTempDirInTempDir()
 		if err != nil {
 			os.Exit(1)
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go
index d94c6c169..59215c7e5 100644
--- a/test/e2e/run_test.go
+++ b/test/e2e/run_test.go
@@ -634,7 +634,6 @@ USER mail`
 	})
 
 	It("podman run --volumes-from flag with built-in volumes", func() {
-		Skip(v2fail)
 		session := podmanTest.Podman([]string{"create", redis, "sh"})
 		session.WaitWithDefaultTimeout()
 		Expect(session.ExitCode()).To(Equal(0))
@@ -729,7 +728,6 @@ USER mail`
 	})
 
 	It("podman run --pod automatically", func() {
-		Skip(v2fail)
 		session := podmanTest.Podman([]string{"run", "--pod", "new:foobar", ALPINE, "ls"})
 		session.WaitWithDefaultTimeout()
 		Expect(session.ExitCode()).To(Equal(0))
diff --git a/test/e2e/start_test.go b/test/e2e/start_test.go
index 5f6f5a8cf..6af0b7068 100644
--- a/test/e2e/start_test.go
+++ b/test/e2e/start_test.go
@@ -17,7 +17,6 @@ var _ = Describe("Podman start", func() {
 	)
 
 	BeforeEach(func() {
-		Skip(v2fail)
 		tempdir, err = CreateTempDirInTempDir()
 		if err != nil {
 			os.Exit(1)
@@ -66,10 +65,11 @@ var _ = Describe("Podman start", func() {
 		session.WaitWithDefaultTimeout()
 		Expect(session.ExitCode()).To(Equal(0))
 		cid := session.OutputToString()
-		session = podmanTest.Podman([]string{"container", "start", cid[0:10]})
+		shortID := cid[0:10]
+		session = podmanTest.Podman([]string{"container", "start", shortID})
 		session.WaitWithDefaultTimeout()
 		Expect(session.ExitCode()).To(Equal(0))
-		Expect(session.OutputToString()).To(Equal(cid))
+		Expect(session.OutputToString()).To(Equal(shortID))
 	})
 
 	It("podman start single container by name", func() {