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 /libpod/runtime_pod_infra_linux.go | |
| 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 'libpod/runtime_pod_infra_linux.go')
| -rw-r--r-- | libpod/runtime_pod_infra_linux.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libpod/runtime_pod_infra_linux.go b/libpod/runtime_pod_infra_linux.go index 279cafa39..155ac83d9 100644 --- a/libpod/runtime_pod_infra_linux.go +++ b/libpod/runtime_pod_infra_linux.go @@ -23,7 +23,7 @@ const ( IDTruncLength = 12 ) -func (r *Runtime) makeInfraContainer(ctx context.Context, p *Pod, imgName, imgID string, config *v1.ImageConfig) (*Container, error) { +func (r *Runtime) makeInfraContainer(ctx context.Context, p *Pod, imgName, rawImageName, imgID string, config *v1.ImageConfig) (*Container, error) { // Set up generator for infra container defaults g, err := generate.New("linux") @@ -127,7 +127,7 @@ func (r *Runtime) makeInfraContainer(ctx context.Context, p *Pod, imgName, imgID containerName := p.ID()[:IDTruncLength] + "-infra" options = append(options, r.WithPod(p)) - options = append(options, WithRootFSFromImage(imgID, imgName)) + options = append(options, WithRootFSFromImage(imgID, imgName, rawImageName)) options = append(options, WithName(containerName)) options = append(options, withIsInfra()) @@ -154,5 +154,5 @@ func (r *Runtime) createInfraContainer(ctx context.Context, p *Pod) (*Container, imageName := newImage.Names()[0] imageID := data.ID - return r.makeInfraContainer(ctx, p, imageName, imageID, data.Config) + return r.makeInfraContainer(ctx, p, imageName, r.config.InfraImage, imageID, data.Config) } |