Skip to content

Commit

Permalink
[201811][dockers] Upgrade rsyslog to latest version available from je…
Browse files Browse the repository at this point in the history
…ssie-backports repo (#3127)

Upgrade the version of rsyslog installed in Docker containers to the latest version available from jessie-backports repo (currently 8.23.0-2~bpo). Based off my change to the 201803 branch (#2709). This should eliminate some memory leaks and will prevent any regressions if moving from the 201803 branch to the 201811 branch.
  • Loading branch information
jleveque authored and lguohan committed Jul 6, 2019
1 parent b8bdeff commit 9e02684
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
9 changes: 6 additions & 3 deletions dockers/docker-base/Dockerfile.j2
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -23,17 +23,20 @@ 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
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"]
Expand Down
1 change: 1 addition & 0 deletions dockers/docker-base/no-check-valid-until
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Acquire::Check-Valid-Until "false";
1 change: 1 addition & 0 deletions dockers/docker-base/sources.list
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 9e02684

Please sign in to comment.