summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-12-07 14:04:09 -0500
committerGitHub <noreply@github.com>2020-12-07 14:04:09 -0500
commita5ca03915e7ad8b9db81d22a256013ce5ae3cc87 (patch)
tree67a22d69d62f19ea1f23be0414e16dd8a6d16350 /libpod
parent51166d08983378f57d270fe8ac814372684cdd50 (diff)
parentc050fad958fb86a2647bf318671e348fb2fa1904 (diff)
downloadpodman-a5ca03915e7ad8b9db81d22a256013ce5ae3cc87.tar.gz
podman-a5ca03915e7ad8b9db81d22a256013ce5ae3cc87.tar.bz2
podman-a5ca03915e7ad8b9db81d22a256013ce5ae3cc87.zip
Merge pull request #8632 from mheon/fix_8613
Change name of imageVolumes in container config JSON
Diffstat (limited to 'libpod')
-rw-r--r--libpod/container_config.go8
1 files changed, 7 insertions, 1 deletions
diff --git a/libpod/container_config.go b/libpod/container_config.go
index cc3ad25ea..c95be9b55 100644
--- a/libpod/container_config.go
+++ b/libpod/container_config.go
@@ -135,7 +135,13 @@ type ContainerRootFSConfig struct {
// OverlayVolumes lists the overlay volumes to mount into the container.
OverlayVolumes []*ContainerOverlayVolume `json:"overlayVolumes,omitempty"`
// ImageVolumes lists the image volumes to mount into the container.
- ImageVolumes []*ContainerImageVolume `json:"imageVolumes,omitempty"`
+ // Please note that this is named ctrImageVolumes in JSON to
+ // distinguish between these and the old `imageVolumes` field in Podman
+ // pre-1.8, which was used in very old Podman versions to determine how
+ // image volumes were handled in Libpod (support for these eventually
+ // moved out of Libpod into pkg/specgen).
+ // Please DO NOT re-use the `imageVolumes` name in container JSON again.
+ ImageVolumes []*ContainerImageVolume `json:"ctrImageVolumes,omitempty"`
// CreateWorkingDir indicates that Libpod should create the container's
// working directory if it does not exist. Some OCI runtimes do this by
// default, but others do not.