Skip to content

Commit 9e02684

Browse files
jlevequelguohan
authored andcommitted
[201811][dockers] Upgrade rsyslog to latest version available from jessie-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.
1 parent b8bdeff commit 9e02684

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

dockers/docker-base/Dockerfile.j2

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM debian:jessie
22

3-
## Remove retired jessie-updates repo
3+
# Remove retired jessie-updates repo
44
RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
55

66
# Clean documentation in FROM image
@@ -23,17 +23,20 @@ ENV DEBIAN_FRONTEND=noninteractive
2323
# Configure data sources for apt/dpkg
2424
COPY ["dpkg_01_drop", "/etc/dpkg/dpkg.cfg.d/01_drop"]
2525
COPY ["sources.list", "/etc/apt/sources.list"]
26-
COPY ["no_install_recommend_suggest", "/etc/apt/apt.conf.d"]
26+
COPY ["no-check-valid-until", "no-install-recommend-suggest", "/etc/apt/apt.conf.d/"]
2727
RUN apt-get update
2828

2929
# Pre-install fundamental packages
3030
RUN apt-get -y install \
3131
vim-tiny \
3232
perl \
3333
python \
34-
rsyslog \
3534
less
3635

36+
# Install a newer version of rsyslog from jessie-backports in hopes of
37+
# eliminating memory leaks
38+
RUN apt-get -y -t jessie-backports install rsyslog
39+
3740
COPY ["etc/rsyslog.conf", "/etc/rsyslog.conf"]
3841
COPY ["etc/rsyslog.d/*", "/etc/rsyslog.d/"]
3942
COPY ["root/.vimrc", "/root/.vimrc"]
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Acquire::Check-Valid-Until "false";

dockers/docker-base/sources.list

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ deb http://debian-archive.trafficmanager.net/debian/ jessie main contrib non-fre
55
deb-src http://debian-archive.trafficmanager.net/debian/ jessie main contrib non-free
66
deb http://debian-archive.trafficmanager.net/debian-security/ jessie/updates main contrib non-free
77
deb-src http://debian-archive.trafficmanager.net/debian-security/ jessie/updates main contrib non-free
8+
deb http://archive.debian.org/debian/ jessie-backports main contrib non-free

0 commit comments

Comments
 (0)