2 files changed, 39 insertions, 1 deletions
diff --git a/pkg/bindings/containers/containers.go b/pkg/bindings/containers/containers.go
index a188d73a0..963f0ec57 100644
--- a/pkg/bindings/containers/containers.go
+++ b/pkg/bindings/containers/containers.go
@@ -12,6 +12,7 @@ import (
 	"github.com/containers/libpod/pkg/api/handlers"
 	"github.com/containers/libpod/pkg/bindings"
 	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/pkg/errors"
 )
 
 // List obtains a list of containers in local storage.  All parameters to this method are optional.
@@ -316,3 +317,21 @@ func Export(ctx context.Context, nameOrID string, w io.Writer) error {
 	}
 	return response.Process(nil)
 }
+
+// ContainerInit takes a created container and executes all of the
+// preparations to run the container except it will not start
+// or attach to the container
+func ContainerInit(ctx context.Context, nameOrID string) error {
+	conn, err := bindings.GetClient(ctx)
+	if err != nil {
+		return err
+	}
+	response, err := conn.DoRequest(nil, http.MethodPost, "/containers/%s/init", nil, nameOrID)
+	if err != nil {
+		return err
+	}
+	if response.StatusCode == http.StatusNotModified {
+		return errors.Wrapf(define.ErrCtrStateInvalid, "container %s has already been created in runtime", nameOrID)
+	}
+	return response.Process(nil)
+}
diff --git a/pkg/bindings/test/containers_test.go b/pkg/bindings/test/containers_test.go
index ee5df40a0..c6501ac9e 100644
--- a/pkg/bindings/test/containers_test.go
+++ b/pkg/bindings/test/containers_test.go
@@ -508,8 +508,27 @@ var _ = Describe("Podman containers ", func() {
 		_, err = bt.RunTopContainer(&name2, &bindings.PFalse, nil)
 		Expect(err).To(BeNil())
 		containerLatestList, err := containers.List(bt.conn, nil, nil, &latestContainers, nil, nil, nil)
-		err = containers.Kill(bt.conn, containerLatestList[0].Names[0], "SIGTERM")
 		Expect(err).To(BeNil())
+		err = containers.Kill(bt.conn, containerLatestList[0].Names(), "SIGTERM")
+		Expect(err).To(BeNil())
+	})
+
+	It("container init on a bogus container", func() {
+		err := containers.ContainerInit(bt.conn, "doesnotexist")
+		Expect(err).ToNot(BeNil())
+		code, _ := bindings.CheckResponseCode(err)
+		Expect(code).To(BeNumerically("==", http.StatusNotFound))
+	})
+
+	It("container init", func() {
+		s := specgen.NewSpecGenerator(alpine.name)
+		ctr, err := containers.CreateWithSpec(bt.conn, s)
+		Expect(err).To(BeNil())
+		err = containers.ContainerInit(bt.conn, ctr.ID)
+		Expect(err).To(BeNil())
+		//	trying to init again should be an error
+		err = containers.ContainerInit(bt.conn, ctr.ID)
+		Expect(err).ToNot(BeNil())
 	})
 
 })