summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-09-16 09:00:47 +0200
committerGitHub <noreply@github.com>2020-09-16 09:00:47 +0200
commitb9c47fa40bc503e155a528174974293c6b053ec2 (patch)
tree19d0678caeb7d013ca2c729215744725cee2f801 /cmd
parent26049193e0829c2ac841ff852732ddb4223a01fb (diff)
parentce6efadd5cfe48bc8af4798a4747b74398cb4a1e (diff)
downloadpodman-b9c47fa40bc503e155a528174974293c6b053ec2.tar.gz
podman-b9c47fa40bc503e155a528174974293c6b053ec2.tar.bz2
podman-b9c47fa40bc503e155a528174974293c6b053ec2.zip
Merge pull request #7636 from vrothberg/fix-7407
run/create: record raw image
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/containers/create.go3
-rw-r--r--cmd/podman/containers/run.go3
2 files changed, 6 insertions, 0 deletions
diff --git a/cmd/podman/containers/create.go b/cmd/podman/containers/create.go
index f9d33a223..2de1c9c19 100644
--- a/cmd/podman/containers/create.go
+++ b/cmd/podman/containers/create.go
@@ -110,7 +110,9 @@ func create(cmd *cobra.Command, args []string) error {
}
imageName := args[0]
+ rawImageName := ""
if !cliVals.RootFS {
+ rawImageName = args[0]
name, err := pullImage(args[0])
if err != nil {
return err
@@ -121,6 +123,7 @@ func create(cmd *cobra.Command, args []string) error {
if err := common.FillOutSpecGen(s, &cliVals, args); err != nil {
return err
}
+ s.RawImageName = rawImageName
if _, err := createPodIfNecessary(s, cliVals.Net); err != nil {
return err
diff --git a/cmd/podman/containers/run.go b/cmd/podman/containers/run.go
index 34eea14e1..eadfe3a03 100644
--- a/cmd/podman/containers/run.go
+++ b/cmd/podman/containers/run.go
@@ -130,7 +130,9 @@ func run(cmd *cobra.Command, args []string) error {
}
imageName := args[0]
+ rawImageName := ""
if !cliVals.RootFS {
+ rawImageName = args[0]
name, err := pullImage(args[0])
if err != nil {
return err
@@ -177,6 +179,7 @@ func run(cmd *cobra.Command, args []string) error {
if err := common.FillOutSpecGen(s, &cliVals, args); err != nil {
return err
}
+ s.RawImageName = rawImageName
runOpts.Spec = s
if _, err := createPodIfNecessary(s, cliVals.Net); err != nil {