diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-10-27 10:22:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-27 10:22:56 +0000 |
| commit | 979b6312286b4bd993d7be0413e1e95c4a0bad56 (patch) | |
| tree | 0da95f96aa774c035e97d5080f91a563c1f0ec1a /cmd | |
| parent | 9fbf2a40f19e1aea97e46e6e7c7992996f8ca827 (diff) | |
| parent | 75f478c08b82a9d6a99628bee5698a85610f863c (diff) | |
| download | podman-979b6312286b4bd993d7be0413e1e95c4a0bad56.tar.gz podman-979b6312286b4bd993d7be0413e1e95c4a0bad56.tar.bz2 podman-979b6312286b4bd993d7be0413e1e95c4a0bad56.zip | |
Merge pull request #11956 from vrothberg/pause
remove need to download pause image
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/containers/create.go | 9 | ||||
| -rw-r--r-- | cmd/podman/pods/create.go | 10 | ||||
| -rw-r--r-- | cmd/podman/system/version.go | 2 |
3 files changed, 3 insertions, 18 deletions
diff --git a/cmd/podman/containers/create.go b/cmd/podman/containers/create.go index bfeeb7ebe..3be426ae2 100644 --- a/cmd/podman/containers/create.go +++ b/cmd/podman/containers/create.go @@ -372,15 +372,10 @@ func createPodIfNecessary(s *specgen.SpecGenerator, netOpts *entities.NetOptions } infraOpts := entities.ContainerCreateOptions{ImageVolume: "bind", Net: netOpts, Quiet: true} - rawImageName := config.DefaultInfraImage - name, err := PullImage(rawImageName, infraOpts) - if err != nil { - fmt.Println(err) - } - imageName := name + imageName := config.DefaultInfraImage podGen.InfraImage = imageName podGen.InfraContainerSpec = specgen.NewSpecGenerator(imageName, false) - podGen.InfraContainerSpec.RawImageName = rawImageName + podGen.InfraContainerSpec.RawImageName = imageName podGen.InfraContainerSpec.NetworkOptions = podGen.NetworkOptions err = specgenutil.FillOutSpecGen(podGen.InfraContainerSpec, &infraOpts, []string{}) if err != nil { diff --git a/cmd/podman/pods/create.go b/cmd/podman/pods/create.go index 7c2c72171..0a0d43b53 100644 --- a/cmd/podman/pods/create.go +++ b/cmd/podman/pods/create.go @@ -242,16 +242,6 @@ func create(cmd *cobra.Command, args []string) error { } if createOptions.Infra { rawImageName = img - if !infraOptions.RootFS { - curr := infraOptions.Quiet - infraOptions.Quiet = true - name, err := containers.PullImage(imageName, infraOptions) - if err != nil { - fmt.Println(err) - } - imageName = name - infraOptions.Quiet = curr - } podSpec.InfraImage = imageName if infraOptions.Entrypoint != nil { createOptions.InfraCommand = infraOptions.Entrypoint diff --git a/cmd/podman/system/version.go b/cmd/podman/system/version.go index 4502b156c..3ddd19bae 100644 --- a/cmd/podman/system/version.go +++ b/cmd/podman/system/version.go @@ -67,7 +67,7 @@ func version(cmd *cobra.Command, args []string) error { } if err := tmpl.Execute(w, versions); err != nil { // On Failure, assume user is using older version of podman version --format and check client - row = strings.Replace(row, ".Server.", ".", 1) + row = strings.ReplaceAll(row, ".Server.", ".") tmpl, err := report.NewTemplate("version 1.0.0").Parse(row) if err != nil { return err |