From 2553dad766afef1ff36d610a95a5f1a22450d5c3 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Tue, 11 Dec 2018 16:27:05 +0000 Subject: Use existing interface to request IP address during restore The initial implementation to request the same IP address for a container during a restore was based on environment variables influencing CNI. With this commit the IP address selection switches to Podman's internal static IP API. This commit does a comment change in libpod/container_easyjson.go to avoid unnecessary re-generation of libpod/container_easyjson.go during build as this fails in CI. The reason for this is that make sees that libpod/container_easyjson.go needs to be re-created. The commit, however, only changes a part of libpod/container.go which is marked as 'ffjson: skip'. Signed-off-by: Adrian Reber --- libpod/container.go | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'libpod/container.go') diff --git a/libpod/container.go b/libpod/container.go index 44992c534..d0eb6a992 100644 --- a/libpod/container.go +++ b/libpod/container.go @@ -128,6 +128,11 @@ type Container struct { rootlessSlirpSyncR *os.File rootlessSlirpSyncW *os.File + + // A restored container should have the same IP address as before + // being checkpointed. If requestedIP is set it will be used instead + // of config.StaticIP. + requestedIP net.IP } // containerState contains the current state of the container -- cgit v1.2.3-54-g00ecf