From 6bfea68a7435ab84dbe771a5fa775cdddc9da05d Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Fri, 24 Jul 2020 19:49:11 +0000 Subject: [PATCH] Removed pip install into old virtualenv location from Dockerfile, and fixed an rsyslog config issue. - Legacy-Id: 18257 --- docker/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index f62d12bf7..85a477f63 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -131,6 +131,9 @@ RUN apt-get clean && rm -rf /var/lib/apt/lists/* RUN sed -i -e 's/^. en_US/en_US/' -e 's/^. en_GB/en_GB/' -e 's/^. en_IE/en_IE/' /etc/locale.gen RUN locale-gen +# Remove an rsyslog module that we don't need, which also requires extra permissions +RUN sed -i -e '/load="imklog"/d' /etc/rsyslog.conf + # Set up root password RUN echo "root:root" | chpasswd @@ -168,9 +171,6 @@ RUN mkdir -p $DDIR WORKDIR $DDIR COPY requirements.txt ./ -RUN pip$PYREV --no-cache-dir install -r requirements.txt - -COPY settings_local.py ./ COPY setprompt ./ COPY docker-init.sh /docker-init.sh