diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-07 17:28:28 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-07 17:28:28 -0500 |
| commit | 23d2deed30c2491a2cf59644324f27c9eebf7ba4 (patch) | |
| tree | e191f6ea97f53e22f9b43e04900fe9df1e65eef9 /libpod/container_config.go | |
| parent | 4c424e845239aef6e8cdab93dc19f55f4314513c (diff) | |
| parent | 33bde4569ccb65b447150894c56f9a351a09a471 (diff) | |
| download | podman-23d2deed30c2491a2cf59644324f27c9eebf7ba4.tar.gz podman-23d2deed30c2491a2cf59644324f27c9eebf7ba4.tar.bz2 podman-23d2deed30c2491a2cf59644324f27c9eebf7ba4.zip | |
Merge pull request #8640 from mheon/221_backports
Backports for v2.2.1
Diffstat (limited to 'libpod/container_config.go')
| -rw-r--r-- | libpod/container_config.go | 8 |
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. |