diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-18 18:27:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-18 18:27:33 +0100 |
| commit | 45e7cbfef65d0379af19264c5fa90e1ae9ccb74a (patch) | |
| tree | 213fbf640875883d598cff217b933b3c413c5707 /pkg/specgen | |
| parent | d9eb078e2a1cff73461f285924ab1ab8699e9bca (diff) | |
| parent | f4e873c4e10502dd0a7fb14cc2fd87b12760a318 (diff) | |
| download | podman-45e7cbfef65d0379af19264c5fa90e1ae9ccb74a.tar.gz podman-45e7cbfef65d0379af19264c5fa90e1ae9ccb74a.tar.bz2 podman-45e7cbfef65d0379af19264c5fa90e1ae9ccb74a.zip | |
Merge pull request #5480 from vrothberg/auto-updates
auto update containers in systemd units
Diffstat (limited to 'pkg/specgen')
| -rw-r--r-- | pkg/specgen/create.go | 2 | ||||
| -rw-r--r-- | pkg/specgen/specgen.go | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/pkg/specgen/create.go b/pkg/specgen/create.go index 99a99083b..aefbe7405 100644 --- a/pkg/specgen/create.go +++ b/pkg/specgen/create.go @@ -36,7 +36,7 @@ func (s *SpecGenerator) MakeContainer(rt *libpod.Runtime) (*libpod.Container, er return nil, err } - options = append(options, libpod.WithRootFSFromImage(newImage.ID(), s.Image)) + options = append(options, libpod.WithRootFSFromImage(newImage.ID(), s.Image, s.RawImageName)) runtimeSpec, err := s.toOCISpec(rt, newImage) if err != nil { diff --git a/pkg/specgen/specgen.go b/pkg/specgen/specgen.go index e1dfe4dc5..7a430652a 100644 --- a/pkg/specgen/specgen.go +++ b/pkg/specgen/specgen.go @@ -143,6 +143,10 @@ type ContainerStorageConfig struct { // Conflicts with Rootfs. // At least one of Image or Rootfs must be specified. Image string `json:"image"` + // RawImageName is the unprocessed and not-normalized user-specified image + // name. One use case for having this data at hand are auto-updates where + // the _exact_ user input is needed in order to look-up the correct image. + RawImageName string `json:"raw_image_name,omitempty"` // Rootfs is the path to a directory that will be used as the // container's root filesystem. No modification will be made to the // directory, it will be directly mounted into the container as root. |