opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-25 12:20:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12250 from vrothberg/fix-12245

Browse Source 
pod create: read infra image from containers.conf
This commit is contained in:
OpenShift Merge Robot
2021-11-10 15:40:43 +01:00
committed by GitHub
parent 5437568fcd df06664363
commit 93df757b93
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/podman/pods/create.go
View File

@ -11,7 +11,6 @@ import (
"strings"
"github.com/containers/common/pkg/completion"
"github.com/containers/common/pkg/config"
"github.com/containers/common/pkg/sysinfo"
"github.com/containers/podman/v3/cmd/podman/common"
"github.com/containers/podman/v3/cmd/podman/containers"
@ -48,6 +47,7 @@ var (
var (
createOptions entities.PodCreateOptions
infraOptions entities.ContainerCreateOptions
infraImage string
labels, labelFile []string
podIDFile string
replace bool
@ -72,7 +72,7 @@ func init() {
_ = createCommand.RegisterFlagCompletionFunc(nameFlagName, completion.AutocompleteNone)
infraImageFlagName := "infra-image"
flags.String(infraImageFlagName, containerConfig.Engine.InfraImage, "The image of the infra container to associate with the pod")
flags.StringVar(&infraImage, infraImageFlagName, containerConfig.Engine.InfraImage, "The image of the infra container to associate with the pod")
_ = createCommand.RegisterFlagCompletionFunc(infraImageFlagName, common.AutocompleteImages)
podIDFileFlagName := "pod-id-file"
@ -110,7 +110,7 @@ func create(cmd *cobra.Command, args []string) error {
return errors.Wrapf(err, "unable to process labels")
}
imageName = config.DefaultInfraImage
imageName = infraImage
img := imageName
if !createOptions.Infra {
if cmd.Flag("no-hosts").Changed {
@ -151,14 +151,6 @@ func create(cmd *cobra.Command, args []string) error {
return err
}
}
if cmd.Flag("infra-image").Changed {
// Only send content to server side if user changed defaults
img, err = cmd.Flags().GetString("infra-image")
imageName = img
if err != nil {
return err
}
}
podName = createOptions.Name
err = common.ContainerToPodOptions(&infraOptions, &createOptions)
if err != nil {

19
test/system/200-pod.bats
View File

@ -60,6 +60,25 @@ function teardown() {
run_podman pod rm -f -t 0 $podid
}
@test "podman pod create - custom infra image" {
image="i.do/not/exist:image"
tmpdir=$PODMAN_TMPDIR/pod-test
run mkdir -p $tmpdir
containersconf=$tmpdir/containers.conf
cat >$containersconf <<EOF
[engine]
infra_image="$image"
EOF
run_podman 125 pod create --infra-image $image
is "$output" ".*initializing source docker://$image:.*"
CONTAINERS_CONF=$containersconf run_podman 125 pod create
is "$output" ".*initializing source docker://$image:.*"
}
function rm_podman_pause_image() {
run_podman version --format "{{.Server.Version}}-{{.Server.Built}}"
run_podman rmi -f "localhost/podman-pause:$output"