Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[201811][dockers] Upgrade rsyslog to latest version available from jessie-backports repo #3127

Merged
merged 1 commit into from
Jul 6, 2019
Merged

[201811][dockers] Upgrade rsyslog to latest version available from jessie-backports repo #3127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions dockers/docker-base/Dockerfile.j2
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Acquire::Check-Valid-Until "false";
0 .../docker-base/no_install_recommend_suggest → .../docker-base/no-install-recommend-suggest
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions dockers/docker-base/sources.list
View file
Open in desktop
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