Pull image on container creation

Signed-off-by: Sascha Grunert <[email protected]>

Author: saschagrunert

cmd/crictl/container.go

@@ -69,6 +69,9 @@ var createContainerCommand = cli.Command{
 		if err := getRuntimeClient(context); err != nil {
 			return err
 		}
+		if err := getImageClient(context); err != nil {
+			return err
+		}
 
 		opts := createOptions{
 			podID: context.Args().Get(0),
@@ -78,7 +81,7 @@ var createContainerCommand = cli.Command{
 			},
 		}
 
-		ctrID, err := CreateContainer(runtimeClient, opts)
+		ctrID, err := CreateContainer(imageClient, runtimeClient, opts)
 		if err != nil {
 			return fmt.Errorf("Creating container failed: %v", err)
 		}
@@ -374,13 +377,16 @@ var runContainerCommand = cli.Command{
 		if err := getRuntimeClient(context); err != nil {
 			return err
 		}
+		if err := getImageClient(context); err != nil {
+			return err
+		}
 
 		opts := runOptions{
 			configPath: context.Args().Get(0),
 			podConfig:  context.Args().Get(1),
 		}
 
-		err := RunContainer(runtimeClient, opts, context.String("runtime"))
+		err := RunContainer(imageClient, runtimeClient, opts, context.String("runtime"))
 		if err != nil {
 			return fmt.Errorf("Running container failed: %v", err)
 		}
@@ -390,27 +396,30 @@ var runContainerCommand = cli.Command{
 
 // RunContainer starts a container in the provided sandbox
 func RunContainer(
-	client pb.RuntimeServiceClient, opts runOptions, runtime string,
+	iClient pb.ImageServiceClient,
+	rClient pb.RuntimeServiceClient,
+	opts runOptions,
+	runtime string,
 ) error {
 	// Create the pod
 	podSandboxConfig, err := loadPodSandboxConfig(opts.podConfig)
 	if err != nil {
 		return fmt.Errorf("load podSandboxConfig failed: %v", err)
 	}
-	podID, err := RunPodSandbox(runtimeClient, podSandboxConfig, runtime)
+	podID, err := RunPodSandbox(rClient, podSandboxConfig, runtime)
 	if err != nil {
 		return fmt.Errorf("run pod sandbox failed: %v", err)
 	}
 
 	// Create the container
 	containerOptions := createOptions{podID, &opts}
-	ctrID, err := CreateContainer(runtimeClient, containerOptions)
+	ctrID, err := CreateContainer(iClient, rClient, containerOptions)
 	if err != nil {
 		return fmt.Errorf("creating container failed: %v", err)
 	}
 
 	// Start the container
-	err = StartContainer(runtimeClient, ctrID)
+	err = StartContainer(rClient, ctrID)
 	if err != nil {
 		return fmt.Errorf("starting the container %q failed: %v", ctrID, err)
 	}
@@ -419,7 +428,12 @@ func RunContainer(
 
 // CreateContainer sends a CreateContainerRequest to the server, and parses
 // the returned CreateContainerResponse.
-func CreateContainer(client pb.RuntimeServiceClient, opts createOptions) (string, error) {
+func CreateContainer(
+	iClient pb.ImageServiceClient,
+	rClient pb.RuntimeServiceClient,
+	opts createOptions,
+) (string, error) {
+
 	config, err := loadContainerConfig(opts.configPath)
 	if err != nil {
 		return "", err
@@ -432,13 +446,19 @@ func CreateContainer(client pb.RuntimeServiceClient, opts createOptions) (string
 		}
 	}
 
+	// Try to pull the image before container creation
+	image := config.GetImage().GetImage()
+	if _, err := PullImage(iClient, image, nil); err != nil {
+		return "", err
+	}
+
 	request := &pb.CreateContainerRequest{
 		PodSandboxId:  opts.podID,
 		Config:        config,
 		SandboxConfig: podConfig,
 	}
 	logrus.Debugf("CreateContainerRequest: %v", request)
-	r, err := client.CreateContainer(context.Background(), request)
+	r, err := rClient.CreateContainer(context.Background(), request)
 	logrus.Debugf("CreateContainerResponse: %v", r)
 	if err != nil {
 		return "", err