From fb163976f4d46bbcbd793bd7a07a2c688d7924b5 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Tue, 24 May 2022 13:49:01 -0400
Subject: Support setting image_volume_mode in containers.conf

Fixes: https://github.com/containers/podman/issues/14230

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
---
 cmd/podman/common/create.go     |  5 ++---
 cmd/podman/common/default.go    |  3 ---
 cmd/podman/containers/create.go | 19 ++++++++++++++-----
 cmd/podman/containers/run.go    | 12 +++++-------
 4 files changed, 21 insertions(+), 18 deletions(-)

(limited to 'cmd/podman')

diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go
index d28becc8a..886c10cb5 100644
--- a/cmd/podman/common/create.go
+++ b/cmd/podman/common/create.go
@@ -255,9 +255,8 @@ func DefineCreateFlags(cmd *cobra.Command, cf *entities.ContainerCreateOptions,
 		_ = cmd.RegisterFlagCompletionFunc(hostUserFlagName, completion.AutocompleteNone)
 
 		imageVolumeFlagName := "image-volume"
-		createFlags.StringVar(
-			&cf.ImageVolume,
-			imageVolumeFlagName, DefaultImageVolume,
+		createFlags.String(
+			imageVolumeFlagName, containerConfig.Engine.ImageVolumeMode,
 			`Tells podman how to handle the builtin image volumes ("bind"|"tmpfs"|"ignore")`,
 		)
 		_ = cmd.RegisterFlagCompletionFunc(imageVolumeFlagName, AutocompleteImageVolume)
diff --git a/cmd/podman/common/default.go b/cmd/podman/common/default.go
index 7caec50ff..6f78d3d29 100644
--- a/cmd/podman/common/default.go
+++ b/cmd/podman/common/default.go
@@ -5,9 +5,6 @@ import (
 )
 
 var (
-
-	// DefaultImageVolume default value
-	DefaultImageVolume = "bind"
 	// Pull in configured json library
 	json = registry.JSONLibrary()
 )
diff --git a/cmd/podman/containers/create.go b/cmd/podman/containers/create.go
index c62ddd6eb..0a513c606 100644
--- a/cmd/podman/containers/create.go
+++ b/cmd/podman/containers/create.go
@@ -102,16 +102,25 @@ func init() {
 	createFlags(containerCreateCommand)
 }
 
-func create(cmd *cobra.Command, args []string) error {
-	var (
-		err error
-	)
+func commonFlags(cmd *cobra.Command) error {
+	var err error
 	flags := cmd.Flags()
 	cliVals.Net, err = common.NetFlagsToNetOptions(nil, *flags)
 	if err != nil {
 		return err
 	}
 
+	if cmd.Flags().Changed("image-volume") {
+		cliVals.ImageVolume = cmd.Flag("image-volume").Value.String()
+	}
+	return nil
+}
+
+func create(cmd *cobra.Command, args []string) error {
+	if err := commonFlags(cmd); err != nil {
+		return err
+	}
+
 	// Check if initctr is used with --pod and the value is correct
 	if initctr := InitContainerType; cmd.Flags().Changed("init-ctr") {
 		if !cmd.Flags().Changed("pod") {
@@ -123,7 +132,7 @@ func create(cmd *cobra.Command, args []string) error {
 		cliVals.InitContainerType = initctr
 	}
 
-	cliVals, err = CreateInit(cmd, cliVals, false)
+	cliVals, err := CreateInit(cmd, cliVals, false)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/podman/containers/run.go b/cmd/podman/containers/run.go
index 951981293..a6c500afa 100644
--- a/cmd/podman/containers/run.go
+++ b/cmd/podman/containers/run.go
@@ -109,7 +109,9 @@ func init() {
 }
 
 func run(cmd *cobra.Command, args []string) error {
-	var err error
+	if err := commonFlags(cmd); err != nil {
+		return err
+	}
 
 	// TODO: Breaking change should be made fatal in next major Release
 	if cliVals.TTY && cliVals.Interactive && !term.IsTerminal(int(os.Stdin.Fd())) {
@@ -122,14 +124,10 @@ func run(cmd *cobra.Command, args []string) error {
 		}
 	}
 
-	flags := cmd.Flags()
-	cliVals.Net, err = common.NetFlagsToNetOptions(nil, *flags)
-	if err != nil {
-		return err
-	}
 	runOpts.CIDFile = cliVals.CIDFile
 	runOpts.Rm = cliVals.Rm
-	if cliVals, err = CreateInit(cmd, cliVals, false); err != nil {
+	cliVals, err := CreateInit(cmd, cliVals, false)
+	if err != nil {
 		return err
 	}
 
-- 
cgit v1.2.3-54-g00ecf