diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/cirrus/README.md | 4 | ||||
| -rw-r--r-- | contrib/podmanimage/README.md | 2 | ||||
| -rw-r--r-- | contrib/podmanimage/stable/Dockerfile | 2 | ||||
| -rw-r--r-- | contrib/podmanimage/testing/Dockerfile | 2 | ||||
| -rw-r--r-- | contrib/podmanimage/upstream/Dockerfile | 2 |
5 files changed, 6 insertions, 6 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: diff --git a/contrib/podmanimage/stable/Dockerfile b/contrib/podmanimage/stable/Dockerfile index 056f62624..6b4eb2220 100644 --- a/contrib/podmanimage/stable/Dockerfile +++ b/contrib/podmanimage/stable/Dockerfile @@ -18,7 +18,7 @@ RUN sed -i -e 's|^#mount_program|mount_program|g' -e '/additionalimage.*/a "/var RUN mkdir -p /var/lib/shared/overlay-images /var/lib/shared/overlay-layers; touch /var/lib/shared/overlay-images/images.lock; touch /var/lib/shared/overlay-layers/layers.lock # Adjust libpod.conf to write logging to a file -RUN sed -i 's/events_logger = "journald"/events_logger = "file"/g' /usr/share/containers/libpod.conf +RUN sed -i 's/# events_logger = "journald"/events_logger = "file"/g' /usr/share/containers/libpod.conf # Set up environment variables to note that this is # not starting with usernamespace and default to diff --git a/contrib/podmanimage/testing/Dockerfile b/contrib/podmanimage/testing/Dockerfile index 50d8ed7f2..4dffc8911 100644 --- a/contrib/podmanimage/testing/Dockerfile +++ b/contrib/podmanimage/testing/Dockerfile @@ -20,7 +20,7 @@ RUN sed -i -e 's|^#mount_program|mount_program|g' -e '/additionalimage.*/a "/var RUN mkdir -p /var/lib/shared/overlay-images /var/lib/shared/overlay-layers; touch /var/lib/shared/overlay-images/images.lock; touch /var/lib/shared/overlay-layers/layers.lock # Adjust libpod.conf to write logging to a file -RUN sed -i 's/events_logger = "journald"/events_logger = "file"/g' /usr/share/containers/libpod.conf +RUN sed -i 's/# events_logger = "journald"/events_logger = "file"/g' /usr/share/containers/libpod.conf # Set up environment variables to note that this is # not starting with usernamespace and default to diff --git a/contrib/podmanimage/upstream/Dockerfile b/contrib/podmanimage/upstream/Dockerfile index 3583e1c54..82b88b50b 100644 --- a/contrib/podmanimage/upstream/Dockerfile +++ b/contrib/podmanimage/upstream/Dockerfile @@ -62,7 +62,7 @@ RUN dnf -y install --exclude container-selinux \ mkdir -p /usr/share/containers; \ cp $GOPATH/src/github.com/containers/libpod/libpod.conf /usr/share/containers; \ # Adjust libpod.conf to write logging to a file - sed -i 's/events_logger = "journald"/events_logger = "file"/g' /usr/share/containers/libpod.conf; \ + sed -i 's/# events_logger = "journald"/events_logger = "file"/g' /usr/share/containers/libpod.conf; \ rm -rf /root/podman/*; \ dnf -y remove git golang go-md2man make; \ dnf clean all; |