Removed pip install into old virtualenv location from Dockerfile, and fixed an rsyslog config issue.

- Legacy-Id: 18257
This commit is contained in:
Henrik Levkowetz 2020-07-24 19:49:11 +00:00
parent 8a4f7d4d33
commit 6bfea68a74

View file

@ -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 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 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 # Set up root password
RUN echo "root:root" | chpasswd RUN echo "root:root" | chpasswd
@ -168,9 +171,6 @@ RUN mkdir -p $DDIR
WORKDIR $DDIR WORKDIR $DDIR
COPY requirements.txt ./ COPY requirements.txt ./
RUN pip$PYREV --no-cache-dir install -r requirements.txt
COPY settings_local.py ./
COPY setprompt ./ COPY setprompt ./
COPY docker-init.sh /docker-init.sh COPY docker-init.sh /docker-init.sh