-
Notifications
You must be signed in to change notification settings - Fork 1.5k
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.
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
[jessie based docker] remove dependency on some retired jessie repos #2707
Conversation
Signed-off-by: Ying Xie <ying.xie@microsoft.com>
Suggest changing PR title to |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggest to also remove the line echo "deb http://debian-archive.trafficmanager.net/debian/ jessie-backports main contrib non-free" >> /etc/apt/sources.list
from sonic-slave/Dockerfile and update title to [docker-base][sonic-slave] Remove dependency on retired jessie-backports repo
The downloaded Jessie docker image still reference jessie-updates. Removing it from the list. Signed-off-by: Ying Xie <ying.xie@microsoft.com>
Adding more changes. This might fix all issues? fingers crossed now. |
Signed-off-by: Ying Xie <ying.xie@microsoft.com>
Any one also seeing this error even after the change:
|
Jipan, Not yet. I think I can build sonic-slave no problem with changes in this PR. Regards, |
It is commented out: sonic-slave/Dockerfile:# RUN apt-get -y install ca-certificates-java=20161107~bpo8+1 openjdk-8-jdk Why are you hitting the issue? |
@jipanyang: the line |
Thanks, my local code needs update. Please ignore the issue. |
…2707) * [jessie repo] remove one dependency on jessie-backport repo Signed-off-by: Ying Xie <ying.xie@microsoft.com> * [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 <ying.xie@microsoft.com> * fix typo * move chunk * [docker-ptf] avoid using retired Jessie repos Signed-off-by: Ying Xie <ying.xie@microsoft.com>
less | ||
|
||
# Install a newer version of rsyslog from jessie-backports in hopes of | ||
# eliminating memory leaks |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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.
Could I merge the changed files into 201811 branch? |
@jleveque
Whether I need to do some action such as clean something before making sonic-broadcom.bin? |
@cony7642: You can try It's probably best to pull down the head of the 201811 branch, since the commit is now in that branch. |
…onic-net#2707) * [jessie repo] remove one dependency on jessie-backport repo Signed-off-by: Ying Xie <ying.xie@microsoft.com> * [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 <ying.xie@microsoft.com> * fix typo * move chunk * [docker-ptf] avoid using retired Jessie repos Signed-off-by: Ying Xie <ying.xie@microsoft.com>
…onic-net#2707) * [jessie repo] remove one dependency on jessie-backport repo Signed-off-by: Ying Xie <ying.xie@microsoft.com> * [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 <ying.xie@microsoft.com> * fix typo * move chunk * [docker-ptf] avoid using retired Jessie repos Signed-off-by: Ying Xie <ying.xie@microsoft.com>
…onic-net#2707) * [jessie repo] remove one dependency on jessie-backport repo Signed-off-by: Ying Xie <ying.xie@microsoft.com> * [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 <ying.xie@microsoft.com> * fix typo * move chunk * [docker-ptf] avoid using retired Jessie repos Signed-off-by: Ying Xie <ying.xie@microsoft.com>
…onic-net#2707) * [jessie repo] remove one dependency on jessie-backport repo Signed-off-by: Ying Xie <ying.xie@microsoft.com> * [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 <ying.xie@microsoft.com> * fix typo * move chunk * [docker-ptf] avoid using retired Jessie repos Signed-off-by: Ying Xie <ying.xie@microsoft.com>
@@ -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 |
There was a problem hiding this comment.
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"]
…onic-net#2707) * [jessie repo] remove one dependency on jessie-backport repo Signed-off-by: Ying Xie <ying.xie@microsoft.com> * [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 <ying.xie@microsoft.com> * fix typo * move chunk * [docker-ptf] avoid using retired Jessie repos Signed-off-by: Ying Xie <ying.xie@microsoft.com> github PR Link: https://github.com/Azure/sonic-buildimage/pull/2707/files RB=1622918 G=lnos-reviewers R=pchaudhary,pmao,rmolina,samaity,sfardeen,zxu A=zxu
- What I did
Some Jessie repo were retired recently. This PR addresses following 2 issues:
Jessie-backports has been retired. we need to use the rsyslog comes with Jessie.
The SONiC base image is running stretch already. We believe running older version of rsyslog in dockers is safe.
Jessie base container downloaded from docker repo still references jessie-updates under main repo. We need to remove it from sources.list.
- How to verify it
build a sonic image.