diff --git a/dockers/docker-base/Dockerfile.j2 b/dockers/docker-base/Dockerfile.j2 index 481af6e821ed..79f5b0b5eb1b 100644 --- a/dockers/docker-base/Dockerfile.j2 +++ b/dockers/docker-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM debian:jessie -## Remove retired jessie-updates repo +# Remove retired jessie-updates repo RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list # Clean documentation in FROM image @@ -23,7 +23,7 @@ ENV DEBIAN_FRONTEND=noninteractive # Configure data sources for apt/dpkg COPY ["dpkg_01_drop", "/etc/dpkg/dpkg.cfg.d/01_drop"] COPY ["sources.list", "/etc/apt/sources.list"] -COPY ["no_install_recommend_suggest", "/etc/apt/apt.conf.d"] +COPY ["no-check-valid-until", "no-install-recommend-suggest", "/etc/apt/apt.conf.d/"] RUN apt-get update # Pre-install fundamental packages @@ -31,9 +31,12 @@ RUN apt-get -y install \ vim-tiny \ perl \ python \ - rsyslog \ less +# Install a newer version of rsyslog from jessie-backports in hopes of +# eliminating memory leaks +RUN apt-get -y -t jessie-backports install rsyslog + COPY ["etc/rsyslog.conf", "/etc/rsyslog.conf"] COPY ["etc/rsyslog.d/*", "/etc/rsyslog.d/"] COPY ["root/.vimrc", "/root/.vimrc"] diff --git a/dockers/docker-base/no-check-valid-until b/dockers/docker-base/no-check-valid-until new file mode 100644 index 000000000000..97b9c9005181 --- /dev/null +++ b/dockers/docker-base/no-check-valid-until @@ -0,0 +1 @@ +Acquire::Check-Valid-Until "false"; diff --git a/dockers/docker-base/no_install_recommend_suggest b/dockers/docker-base/no-install-recommend-suggest similarity index 100% rename from dockers/docker-base/no_install_recommend_suggest rename to dockers/docker-base/no-install-recommend-suggest diff --git a/dockers/docker-base/sources.list b/dockers/docker-base/sources.list index 2ed195cff416..45a508420a89 100644 --- a/dockers/docker-base/sources.list +++ b/dockers/docker-base/sources.list @@ -5,3 +5,4 @@ deb http://debian-archive.trafficmanager.net/debian/ jessie main contrib non-fre deb-src http://debian-archive.trafficmanager.net/debian/ jessie main contrib non-free deb http://debian-archive.trafficmanager.net/debian-security/ jessie/updates main contrib non-free deb-src http://debian-archive.trafficmanager.net/debian-security/ jessie/updates main contrib non-free +deb http://archive.debian.org/debian/ jessie-backports main contrib non-free