add persistentImages

Author: T0MASD

cmd/flags.go

@@ -184,11 +184,11 @@ var disabledFeaturesHelpMessage = `
 Flags with the prefix '--no-' can be used to disable features of the container,
 particularly those that mount volumes or specify extra environment variables.
 
-In addition to CLI flags, these features can be disabled via Viper environment variables or configuration file. 
+In addition to CLI flags, these features can be disabled via Viper environment variables or configuration file.
 
-For example: 
+For example:
 
-	'no-aws' can be set to 'true' in the configuration file, or 
+	'no-aws' can be set to 'true' in the configuration file, or
     'OCMC_NO_AWS' can be set to 'TRUE' in the environment to disable AWS CLI mounts and environment.
 `
 
@@ -234,6 +234,10 @@ var disableFeatureFlags = []cliFlag{
 		name:    "no-persistent-histories",
 		helpMsg: "Disable persistent histories file mounts and environment",
 	},
+	{
+		name:    "no-persistent-images",
+		helpMsg: "Disable local container storage cache mount",
+	},
 	{
 		name:    "no-personalizations",
 		helpMsg: "Disable personalizations file mounts and environment",

pkg/featureSet/persistentImages/persistentImages.go

@@ -0,0 +1,45 @@
+package persistentImages
+
+import (
+	"os"
+	"path/filepath"
+
+	"github.com/openshift/ocm-container/pkg/engine"
+	"github.com/openshift/ocm-container/pkg/ocm"
+)
+
+const (
+	destDir   = "/var/lib/containers/"
+	sourceDir = "/.cache/ocm-container/images/"
+)
+
+type Config struct {
+	Env    map[string]string
+	Mounts []engine.VolumeMount
+}
+
+func New(home string) (*Config, error) {
+	var err error
+
+	config := &Config{}
+
+	ocmClient, err := ocm.NewClient()
+	if err != nil {
+		return config, err
+	}
+	defer ocmClient.Close()
+
+	mount := filepath.Join(home, sourceDir)
+	err = os.MkdirAll(mount, os.ModePerm)
+	if err != nil {
+		return config, err
+	}
+
+	config.Mounts = append(config.Mounts, engine.VolumeMount{
+		Source:       mount,
+		Destination:  destDir,
+		MountOptions: "rw",
+	})
+
+	return config, nil
+}

pkg/ocmcontainer/ocmcontainer.go

@@ -20,6 +20,7 @@ import (
 	"github.com/openshift/ocm-container/pkg/featureSet/osdctl"
 	"github.com/openshift/ocm-container/pkg/featureSet/pagerduty"
 	"github.com/openshift/ocm-container/pkg/featureSet/persistentHistories"
+	"github.com/openshift/ocm-container/pkg/featureSet/persistentImages"
 	personalize "github.com/openshift/ocm-container/pkg/featureSet/personalization"
 	"github.com/openshift/ocm-container/pkg/featureSet/scratch"
 	"github.com/openshift/ocm-container/pkg/ocm"
@@ -223,6 +224,15 @@ func New(cmd *cobra.Command, args []string) (*ocmContainer, error) {
 		}
 	}
 
+	// Persistent container images
+	if featureEnabled("persistent-images") {
+		persistentImagesConfig, err := persistentImages.New(home)
+		if err != nil {
+			return o, err
+		}
+		c.Volumes = append(c.Volumes, persistentImagesConfig.Mounts...)
+	}
+
 	// Personalization
 	if featureEnabled("personalizations") && viper.GetBool("enable_personalization_mount") {
 		personalizationDirOrFile := viper.GetString("personalization_file")