containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16991 from rhatdan/copy 

[CI:DOCS] Describe copy volume options
This commit is contained in:
OpenShift Merge Robot 2023-01-05 06:26:03 -05:00 committed by GitHub
parent 1ba94bc3ca d0c89e90bf
commit 8e80c199d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/source/markdown/options/volume.md
View File

@ -156,6 +156,12 @@ To recursively mount a volume and all of its submounts into a
used, and submounts of the source directory will not be mounted into the
<<container|pod>>.
Mounting the volume with a **copy** option tells podman to copy content from
the underlying destination directory onto newly created internal volumes. The
**copy** only happens on the initial creation of the volume. Content is not
copied up when the volume is subsequently used on different containers. The
**copy** option is ignored on bind mounts and has no effect.
Mounting the volume with the **nosuid** options means that SUID applications on
the volume will not be able to change their privilege. By default volumes
are mounted with **nosuid**.

2
pkg/domain/infra/abi/containers.go
View File

@ -424,7 +424,7 @@ func (ic *ContainerEngine) ContainerRm(ctx context.Context, namesOrIds []string,
}
}
// First, remove dependend containers.
// First, remove dependent containers.
if options.All || options.Depend {
for _, ctr := range libpodContainers {
// When `All` is set, remove the infra containers and

4
test/e2e/run_transient_test.go
View File

@ -49,7 +49,7 @@ var _ = Describe("Podman run with volumes", func() {
_ = SystemExec("ls", []string{"-l", containerStorageDir})
// All files should be in permament store, not volatile
// All files should be in permanent store, not volatile
Expect(filepath.Join(containerStorageDir, "containers.json")).Should(BeARegularFile())
Expect(filepath.Join(containerStorageDir, "volatile-containers.json")).Should(Not(BeAnExistingFile()))
Expect(filepath.Join(runContainerStorageDir, "containers.json")).Should(Not(BeAnExistingFile()))
@ -63,7 +63,7 @@ var _ = Describe("Podman run with volumes", func() {
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
// All files should be in permament store, volatile
// All files should not be in permanent store, not volatile
Expect(filepath.Join(containerStorageDir, "containers.json")).Should(Not(BeAnExistingFile()))
Expect(filepath.Join(containerStorageDir, "volatile-containers.json")).Should(BeARegularFile())
Expect(filepath.Join(runContainerStorageDir, "containers.json")).Should(Not(BeAnExistingFile()))