Skip to content

[jessie based docker] remove dependency on some retired jessie repos #2707

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

Merged
yxieca merged 5 commits into from
Mar 27, 2019
Merged

[jessie based docker] remove dependency on some retired jessie repos #2707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3a2ff72
[jessie repo] remove one dependency on jessie-backport repo
yxieca Mar 26, 2019
6320eb3
[build] remove dependency on retried jessie-backports repo
yxieca Mar 26, 2019
215fe61
fix typo
yxieca Mar 26, 2019
b84b670
move chunk
yxieca Mar 26, 2019
c27d4fa
[docker-ptf] avoid using retired Jessie repos
yxieca Mar 27, 2019
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
8 changes: 4 additions & 4 deletions dockers/docker-base/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Copy link
Collaborator

@qiluo-msft qiluo-msft May 17, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not needed. Later

COPY ["sources.list", "/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

Expand Down Expand Up @@ -28,12 +31,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
Copy link

@TencentSwitchGroup TencentSwitchGroup Mar 28, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to update rsyslog version?

Copy link
Contributor

@jleveque jleveque Mar 28, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We may want to consider it for the 201811 branch, because the Docker images are still based on Jessie (I just did this for the 201803 branch).

For the master branch, we are upgrading all images to Stretch, which has the newer version of rsyslog.

Copy link

@yinshuangshuang yinshuangshuang Jul 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"I just did this for the 201803 branch"
How can I upgrade syslog now for the 201811 branch

Copy link
Contributor

@jleveque jleveque Jul 5, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@yinshuangshuang: Thank you for the suggestion! I have created a PR to upgrade the version of rsyslog installed in the Docker containers in the 2018011 branch here: #3127.

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: 0 additions & 1 deletion dockers/docker-base/sources.list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions dockers/docker-ptf/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(' ') -%}
Expand Down
6 changes: 4 additions & 2 deletions sonic-slave/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@ 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 && \
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
Expand Down