summaryrefslogtreecommitdiff
path: root/contrib/podmanimage/upstream
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-09-10 15:03:16 +0200
committerGitHub <noreply@github.com>2019-09-10 15:03:16 +0200
commit52335367bccc9ea89d53713e5d3bd76af9669238 (patch)
treedefc6623481cde886cd9f105d830ea55a74b997f /contrib/podmanimage/upstream
parent9a55bce9e4d7e1bb3d57dc8879e1a23f559e18ba (diff)
parent8ad6f25db8f702dcf5456bbb583cc4579c55576c (diff)
downloadpodman-52335367bccc9ea89d53713e5d3bd76af9669238.tar.gz
podman-52335367bccc9ea89d53713e5d3bd76af9669238.tar.bz2
podman-52335367bccc9ea89d53713e5d3bd76af9669238.zip
Merge pull request #3964 from TomSweeneyRedHat/dev/tsweeney/journaldimgfix
Turn off journald in podmanimages on quay.io
Diffstat (limited to 'contrib/podmanimage/upstream')
-rw-r--r--contrib/podmanimage/upstream/Dockerfile2
1 files changed, 1 insertions, 1 deletions
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;