diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-16 09:00:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-16 09:00:47 +0200 |
| commit | b9c47fa40bc503e155a528174974293c6b053ec2 (patch) | |
| tree | 19d0678caeb7d013ca2c729215744725cee2f801 /pkg | |
| parent | 26049193e0829c2ac841ff852732ddb4223a01fb (diff) | |
| parent | ce6efadd5cfe48bc8af4798a4747b74398cb4a1e (diff) | |
| download | podman-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 'pkg')
| -rw-r--r-- | pkg/specgen/generate/container_create.go | 2 | ||||
| -rw-r--r-- | pkg/specgen/specgen.go | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go index fda4c098c..2ac3b376f 100644 --- a/pkg/specgen/generate/container_create.go +++ b/pkg/specgen/generate/container_create.go @@ -95,7 +95,7 @@ func MakeContainer(ctx context.Context, rt *libpod.Runtime, s *specgen.SpecGener if len(names) > 0 { imgName = names[0] } - options = append(options, libpod.WithRootFSFromImage(newImage.ID(), imgName, s.Image)) + options = append(options, libpod.WithRootFSFromImage(newImage.ID(), imgName, s.RawImageName)) } if err := s.Validate(); err != nil { return nil, errors.Wrap(err, "invalid config provided") diff --git a/pkg/specgen/specgen.go b/pkg/specgen/specgen.go index cca05eddb..b8f37ec7a 100644 --- a/pkg/specgen/specgen.go +++ b/pkg/specgen/specgen.go @@ -89,6 +89,9 @@ type ContainerBasicConfig struct { // If not given, a default location will be used. // Optional. ConmonPidFile string `json:"conmon_pid_file,omitempty"` + // RawImageName is the user-specified and unprocessed input referring + // to a local or a remote image. + RawImageName string `json:"raw_image_name,omitempty"` // RestartPolicy is the container's restart policy - an action which // will be taken when the container exits. // If not given, the default policy, which does nothing, will be used. |