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.

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

Merged
merged 5 commits into from
Mar 27, 2019

Conversation

yxieca
Copy link
Contributor

@yxieca yxieca commented Mar 26, 2019

- What I did
Some Jessie repo were retired recently. This PR addresses following 2 issues:

  1. 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.

  2. 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.

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
@jleveque
Copy link
Contributor

Suggest changing PR title to [docker-base] Remove dependency on retired jessie-backports repo

@yxieca yxieca changed the title [jessie repo] remove one dependency on jessie-backports repo [docker-base] remove dependency on retired jessie-backports repo Mar 26, 2019
jleveque
jleveque approved these changes Mar 26, 2019
Copy link
Contributor

@jleveque jleveque left a 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>
@yxieca
Copy link
Contributor Author

yxieca commented Mar 26, 2019

Adding more changes. This might fix all issues? fingers crossed now.

@yxieca yxieca changed the title [docker-base] remove dependency on retired jessie-backports repo [docker-base][sonic-slave] remove dependency on some retired jessie repos Mar 26, 2019
sonic-slave/Dockerfile Outdated Show resolved Hide resolved
Signed-off-by: Ying Xie <ying.xie@microsoft.com>
@yxieca yxieca changed the title [docker-base][sonic-slave] remove dependency on some retired jessie repos [jessie based docker] remove dependency on some retired jessie repos Mar 27, 2019
@jleveque jleveque self-requested a review March 27, 2019 01:07
@jipanyang
Copy link
Collaborator

Any one also seeing this error even after the change:

Removing intermediate container 091b0d74ba27
 ---> 105eac3dcad4
Step 10/36 : RUN apt-get -y install ca-certificates-java=20161107~bpo8+1 openjdk-8-jdk
 ---> Running in 28e4fed66c1d
Reading package lists...
Building dependency tree...
Reading state information...
Package openjdk-8-jdk is not available, but is referred to by another package.
This may mean that the package is missing, has been obsoleted, or
is only available from another source

E: Version '20161107~bpo8+1' for 'ca-certificates-java' was not found
E: Package 'openjdk-8-jdk' has no installation candidate
The command '/bin/sh -c apt-get -y install ca-certificates-java=20161107~bpo8+1 openjdk-8-jdk' returned a non-zero code: 100
Makefile.work:137: recipe for target 'list' failed
make[1]: *** [list] Error 100

@yxieca
Copy link
Contributor Author

yxieca commented Mar 27, 2019

Jipan,

Not yet. I think I can build sonic-slave no problem with changes in this PR.

Regards,
Ying

@yxieca
Copy link
Contributor Author

yxieca commented Mar 27, 2019

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?

@jleveque
Copy link
Contributor

@jipanyang: the line RUN apt-get -y install ca-certificates-java=20161107~bpo8+1 openjdk-8-jdk has been commented out in the master branch.

@jipanyang
Copy link
Collaborator

@jipanyang: the line RUN apt-get -y install ca-certificates-java=20161107~bpo8+1 openjdk-8-jdk has been commented out in the master branch.

Thanks, my local code needs update. Please ignore the issue.

@yxieca yxieca merged commit 9af7d21 into sonic-net:master Mar 27, 2019
@yxieca yxieca deleted the build branch March 27, 2019 06:46
yxieca added a commit that referenced this pull request Mar 27, 2019
…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

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

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.

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

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.

@cony7642
Copy link

cony7642 commented Apr 9, 2019

Could I merge the changed files into 201811 branch?

@jleveque
Copy link
Contributor

jleveque commented Apr 9, 2019

@cony7642: This commit was already cherry-picked into the 201811 branch: 5043e22

@cony7642
Copy link

cony7642 commented Apr 9, 2019

@jleveque
I merge the 5043e22 to my local 201811 branch but make sonic-broadcom.bin will error as below

++ echo 201811.0-dirty-20190408.173736
+ sudo LANG=C chroot ./fsroot docker tag docker-snmp-sv2:latest docker-snmp-sv2:201811.0-dirty-20190408.173736
+ sudo LANG=C chroot ./fsroot docker load
open /var/lib/docker/tmp/docker-import-810914033/repositories: no such file or directory

Whether I need to do some action such as clean something before making sonic-broadcom.bin?

@jleveque
Copy link
Contributor

jleveque commented Apr 9, 2019

@cony7642: You can try make clean, but it seems there are issues with your Docker environment.

It's probably best to pull down the head of the 201811 branch, since the commit is now in that branch.

tiantianlv pushed a commit to SONIC-DEV/sonic-buildimage that referenced this pull request Apr 10, 2019
…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>
tiantianlv pushed a commit to SONIC-DEV/sonic-buildimage that referenced this pull request Apr 10, 2019
…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>
tiantianlv pushed a commit to SONIC-DEV/sonic-buildimage that referenced this pull request Apr 10, 2019
…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>
ishidawataru pushed a commit to ishidawataru/sonic-buildimage that referenced this pull request Apr 25, 2019
…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
Copy link
Collaborator

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"]

zhenggen-xu pushed a commit to zhenggen-xu/sonic-buildimage that referenced this pull request Oct 17, 2019
…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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants