diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-09 07:41:47 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-09 07:41:47 -0800 |
| commit | 7b9d4f1c92a644df612b142183023b265256bdff (patch) | |
| tree | 62dcb4fa44d45dc3f3db7fbd8fb2f533ec8e1d44 /libpod/container_internal_linux.go | |
| parent | 506108194a137426069263aaa351fa333851190d (diff) | |
| parent | 2553dad766afef1ff36d610a95a5f1a22450d5c3 (diff) | |
| download | podman-7b9d4f1c92a644df612b142183023b265256bdff.tar.gz podman-7b9d4f1c92a644df612b142183023b265256bdff.tar.bz2 podman-7b9d4f1c92a644df612b142183023b265256bdff.zip | |
Merge pull request #2061 from adrianreber/static-ip
Use existing interface to request IP address during restore
Diffstat (limited to 'libpod/container_internal_linux.go')
| -rw-r--r-- | libpod/container_internal_linux.go | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index c66be1061..582a4c3e7 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -549,10 +549,8 @@ func (c *Container) restore(ctx context.Context, options ContainerCheckpointOpti } } if IP != nil { - env := fmt.Sprintf("IP=%s", IP) // Tell CNI which IP address we want. - os.Setenv("CNI_ARGS", env) - logrus.Debugf("Restoring container with %s", env) + c.requestedIP = IP } } @@ -568,12 +566,6 @@ func (c *Container) restore(ctx context.Context, options ContainerCheckpointOpti return err } - // TODO: use existing way to request static IPs, once it is merged in ocicni - // https://github.com/cri-o/ocicni/pull/23/ - - // CNI_ARGS was used to request a certain IP address. Unconditionally remove it. - os.Unsetenv("CNI_ARGS") - // Read config jsonPath := filepath.Join(c.bundlePath(), "config.json") logrus.Debugf("generate.NewFromFile at %v", jsonPath) |