diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-09-10 19:17:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-10 19:17:39 +0200 |
| commit | c1761ba1ac4155bab82fb9b847ccf96489b98265 (patch) | |
| tree | c956513692f2052d73a2889413fd805e123f006e /contrib | |
| parent | 095647cd6f67fcc761ef49460bb94ba5cc38a1c3 (diff) | |
| parent | 3d240bd7953c7c666c4a42f230cf40f1095abbee (diff) | |
| download | podman-c1761ba1ac4155bab82fb9b847ccf96489b98265.tar.gz podman-c1761ba1ac4155bab82fb9b847ccf96489b98265.tar.bz2 podman-c1761ba1ac4155bab82fb9b847ccf96489b98265.zip | |
Merge pull request #3817 from xcffl/master
Add explanation mounting named volumes for `podman run`
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/cirrus/README.md | 4 | ||||
| -rw-r--r-- | contrib/podmanimage/README.md | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/cirrus/README.md b/contrib/cirrus/README.md index ada362d95..7aa8881d6 100644 --- a/contrib/cirrus/README.md +++ b/contrib/cirrus/README.md @@ -72,7 +72,7 @@ and `darwin` targets. ### ``special_testing_cgroupv2`` Task Use the latest Fedora release with the required kernel options pre-set for -exercising cgroups v2 with podman integration tests. Also depends on +exercising cgroups v2 with Podman integration tests. Also depends on having `SPECIALMODE` set to 'cgroupv2` @@ -272,7 +272,7 @@ values follows: * `rootless`: Causes a random, ordinary user account to be created and utilized for testing. * `in_podman`: Causes testing to occur within a container executed by - podman on the host. + Podman on the host. * `cgroupv2`: The kernel on this VM was prepared with options to enable v2 cgroups * `windows`: See **darwin** * `darwin`: Signals the ``special_testing_cross`` task to cross-compile the remote client. diff --git a/contrib/podmanimage/README.md b/contrib/podmanimage/README.md index 3dc07ad63..ab55f3189 100644 --- a/contrib/podmanimage/README.md +++ b/contrib/podmanimage/README.md @@ -5,7 +5,7 @@ ## Overview This directory contains the Dockerfiles necessary to create the three podmanimage container -images that are housed on quay.io under the podman account. All three repositories where +images that are housed on quay.io under the Podman account. All three repositories where the images live are public and can be pulled without credentials. These container images are secured and the resulting containers can run safely with privileges within the container. The container images are built using the latest Fedora and then Podman is installed into them: |