opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-17 17:43:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Turn off journald in podmanimages on quay.io

Browse Source 
In the Dockerfiles that are used to build the podman images on
quay.io, we were changing the events_logger from journald to
file in libpod.conf, but we weren't enabling it as we didn't
remove the comment.  This corrects that and addresses: #3464

Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
This commit is contained in:
TomSweeneyRedHat
2019-09-06 19:55:20 -04:00
parent 30cbb00915
commit 8ad6f25db8
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/podmanimage/stable/Dockerfile
View File

@ -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 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 # 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 # Set up environment variables to note that this is
# not starting with usernamespace and default to # not starting with usernamespace and default to

2
contrib/podmanimage/testing/Dockerfile
View File

@ -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 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 # 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 # Set up environment variables to note that this is
# not starting with usernamespace and default to # not starting with usernamespace and default to

2
contrib/podmanimage/upstream/Dockerfile
View File

@ -62,7 +62,7 @@ RUN dnf -y install --exclude container-selinux \
mkdir -p /usr/share/containers; \ mkdir -p /usr/share/containers; \
cp $GOPATH/src/github.com/containers/libpod/libpod.conf /usr/share/containers; \ cp $GOPATH/src/github.com/containers/libpod/libpod.conf /usr/share/containers; \
# Adjust libpod.conf to write logging to a file # 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/*; \ rm -rf /root/podman/*; \
dnf -y remove git golang go-md2man make; \ dnf -y remove git golang go-md2man make; \
dnf clean all; dnf clean all;