From 3a2ff72f02a0ed9d0099e716563e468791820c32 Mon Sep 17 00:00:00 2001 From: Ying Xie Date: Tue, 26 Mar 2019 18:00:20 +0000 Subject: [PATCH 1/5] [jessie repo] remove one dependency on jessie-backport repo Signed-off-by: Ying Xie --- dockers/docker-base/Dockerfile.j2 | 5 +---- dockers/docker-base/sources.list | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dockers/docker-base/Dockerfile.j2 b/dockers/docker-base/Dockerfile.j2 index 2aef59241b13..00195cfcc768 100644 --- a/dockers/docker-base/Dockerfile.j2 +++ b/dockers/docker-base/Dockerfile.j2 @@ -28,12 +28,9 @@ 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/sources.list b/dockers/docker-base/sources.list index 7121d6fd8c2d..2ed195cff416 100644 --- a/dockers/docker-base/sources.list +++ b/dockers/docker-base/sources.list @@ -5,4 +5,3 @@ 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 From 6320eb362df6b39be21cc12f19316ae4975c570b Mon Sep 17 00:00:00 2001 From: Ying Xie Date: Tue, 26 Mar 2019 20:35:22 +0000 Subject: [PATCH 2/5] [build] remove dependency on retried jessie-backports repo The downloaded Jessie docker image still reference jessie-updates. Removing it from the list. Signed-off-by: Ying Xie --- sonic-slave/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sonic-slave/Dockerfile b/sonic-slave/Dockerfile index a0eedb0937bc..d0c86bcf180b 100644 --- a/sonic-slave/Dockerfile +++ b/sonic-slave/Dockerfile @@ -5,12 +5,14 @@ MAINTAINER johnar@microsoft.com RUN echo "deb http://debian-archive.trafficmanager.net/debian/ jessie main contrib non-free" >> /etc/apt/sources.list && \ 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 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 ## Make apt-get non-interactive ENV DEBIAN_FRONTEND=noninteractive +## Remove retried jessie-updates repo +RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list + RUN apt-get update && apt-get install -y \ apt-utils \ default-jre-headless \ From 215fe61dbf18d5614c3a6847b24fa59c4ab0f501 Mon Sep 17 00:00:00 2001 From: Ying Xie Date: Tue, 26 Mar 2019 20:37:45 +0000 Subject: [PATCH 3/5] fix typo --- sonic-slave/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonic-slave/Dockerfile b/sonic-slave/Dockerfile index d0c86bcf180b..8a0cb51e779a 100644 --- a/sonic-slave/Dockerfile +++ b/sonic-slave/Dockerfile @@ -10,7 +10,7 @@ RUN echo "deb http://debian-archive.trafficmanager.net/debian/ jessie main contr ## Make apt-get non-interactive ENV DEBIAN_FRONTEND=noninteractive -## Remove retried 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 RUN apt-get update && apt-get install -y \ From b84b670bab3f642bf7f8cd999d8535b30da4b4de Mon Sep 17 00:00:00 2001 From: Ying Xie Date: Tue, 26 Mar 2019 22:34:39 +0000 Subject: [PATCH 4/5] move chunk --- sonic-slave/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sonic-slave/Dockerfile b/sonic-slave/Dockerfile index 8a0cb51e779a..80f669899ae6 100644 --- a/sonic-slave/Dockerfile +++ b/sonic-slave/Dockerfile @@ -2,6 +2,9 @@ FROM debian:jessie MAINTAINER johnar@microsoft.com +## Remove retired jessie-updates repo +RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list + RUN echo "deb http://debian-archive.trafficmanager.net/debian/ jessie main contrib non-free" >> /etc/apt/sources.list && \ 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 && \ @@ -10,9 +13,6 @@ RUN echo "deb http://debian-archive.trafficmanager.net/debian/ jessie main contr ## Make apt-get non-interactive ENV DEBIAN_FRONTEND=noninteractive -## Remove retired jessie-updates repo -RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list - RUN apt-get update && apt-get install -y \ apt-utils \ default-jre-headless \ From c27d4fa488726781bc829b74a04f85990bba8eba Mon Sep 17 00:00:00 2001 From: Ying Xie Date: Wed, 27 Mar 2019 00:55:36 +0000 Subject: [PATCH 5/5] [docker-ptf] avoid using retired Jessie repos Signed-off-by: Ying Xie --- dockers/docker-base/Dockerfile.j2 | 3 +++ dockers/docker-ptf/Dockerfile.j2 | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dockers/docker-base/Dockerfile.j2 b/dockers/docker-base/Dockerfile.j2 index 00195cfcc768..c622e6a59843 100644 --- a/dockers/docker-base/Dockerfile.j2 +++ b/dockers/docker-base/Dockerfile.j2 @@ -1,5 +1,8 @@ FROM debian:jessie +## 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 RUN find /usr/share/doc -depth \( -type f -o -type l \) ! -name copyright | xargs rm || true diff --git a/dockers/docker-ptf/Dockerfile.j2 b/dockers/docker-ptf/Dockerfile.j2 index 89460f079811..cfa798967432 100644 --- a/dockers/docker-ptf/Dockerfile.j2 +++ b/dockers/docker-ptf/Dockerfile.j2 @@ -2,6 +2,9 @@ FROM debian:jessie MAINTAINER Pavel Shirshov +## Remove retired jessie-updates repo +RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list + ## Copy dependencies COPY \ {% for deb in docker_ptf_debs.split(' ') -%}