Download newer version (8.23.0-2) of rsyslog from jessie-backports in…

… hopes of eliminating memory leaks (#1912)
sonic-net · Aug 17, 2018 · 5817dcf · 5817dcf
1 parent 511eada
commit 5817dcf
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 3 deletions.
diff --git a/build_debian.sh b/build_debian.sh
@@ -204,7 +204,6 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     openssh-server          \
     python                  \
     python-setuptools       \
-    rsyslog                 \
     monit                   \
     python-apt              \
     traceroute              \
@@ -227,6 +226,10 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     grub2-common            \
     ethtool
 
+# Install a newer version of rsyslog from jessie-backports in hopes of
+# eliminating memory leaks
+sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y -t jessie-backports install rsyslog
+
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y download \
     grub-pc-bin
 

diff --git a/dockers/docker-base/Dockerfile.j2 b/dockers/docker-base/Dockerfile.j2
@@ -24,12 +24,15 @@ RUN apt-get update
 
 # Pre-install fundamental packages
 RUN apt-get -y install \
-    rsyslog            \
     vim-tiny           \
     perl               \
     python             \
     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/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://debian-archive.trafficmanager.net/debian/ jessie-backports main contrib non-free
diff --git a/files/apt/sources.list b/files/apt/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://debian-archive.trafficmanager.net/debian/ jessie-backports main contrib non-free
diff --git a/files/image_config/apt/sources.list.d/debian_archive_trafficmanager_net_debian.list b/files/image_config/apt/sources.list.d/debian_archive_trafficmanager_net_debian.list
@@ -1,2 +1,3 @@
 deb 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 http://debian-archive.trafficmanager.net/debian/ jessie-backports main contrib non-free
diff --git a/sonic-slave/Dockerfile b/sonic-slave/Dockerfile
@@ -6,7 +6,7 @@ RUN echo "deb http://debian-archive.trafficmanager.net/debian/ jessie main contr
         echo "deb-src http://debian-archive.trafficmanager.net/debian/ jessie main contrib non-free" >> /etc/apt/sources.list && \
         echo "deb http://debian-archive.trafficmanager.net/debian-security/ jessie/updates main contrib non-free" >> /etc/apt/sources.list && \
         echo "deb-src http://debian-archive.trafficmanager.net/debian-security/ jessie/updates main contrib non-free" >> /etc/apt/sources.list && \
-        echo 'deb http://debian-archive.trafficmanager.net/debian jessie-backports main' >> /etc/apt/sources.list
+        echo "deb http://debian-archive.trafficmanager.net/debian/ jessie-backports main contrib non-free" >> /etc/apt/sources.list
 
 ## Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive