Upgrade docker-sonic-vs and docker-syncd-vs to Bullseye #13294
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| FROM docker-swss-layer-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}} | ||
|
|
||
| ARG docker_container_name | ||
|
|
||
|
|
@@ -24,10 +24,6 @@ RUN apt-get install -y net-tools \ | |
| python-ply \ | ||
| libqt5core5a \ | ||
| libqt5network5 \ | ||
|
There was a problem hiding this comment. Hi @saiarcot895 , why removed libboost package? There was a problem hiding this comment. https://github.com/sonic-net/sonic-swss-common/blob/e3d9024602847d5bb41e14f153099431ef35f291/debian/control#L5 There was a problem hiding this comment. Boost 1.71 is not available in Bullseye, Bullseye has Boost 1.74. Because of this (and other differences), the pipelines for swss-common, swss, and sairedis were bound to fail. In addition, the base layer of this container has changed; it's now based on swss-layer-bullseye (which will contain both swss and swsscommon). As for the pipeline breakages, I've already opened sonic-net/sonic-swss-common#716 to fix it for swss-common. Once that is fixed, I should be able to fix it for sairedis (sonic-net/sonic-sairedis#1225) and swss (PR to be opened). |
||
| libgmp10 \ | ||
| libjudydebian1 \ | ||
| openssh-client \ | ||
|
|
@@ -41,8 +37,7 @@ RUN apt-get install -y net-tools \ | |
| logrotate \ | ||
| apt-utils \ | ||
| psmisc \ | ||
| python3-scapy \ | ||
| conntrack \ | ||
| iptables \ | ||
| jq \ | ||
|
|
@@ -52,8 +47,6 @@ RUN apt-get install -y net-tools \ | |
| # For installing Python m2crypto package | ||
| # (these can be uninstalled after installation) | ||
| build-essential \ | ||
| python3-dev \ | ||
| libssl-dev \ | ||
| swig \ | ||
|
|
@@ -72,40 +65,10 @@ RUN apt-get install -y net-tools \ | |
| libdbus-1-3 \ | ||
| libgirepository-1.0-1 \ | ||
| {%- if ENABLE_ASAN == "y" %} | ||
| libasan6 \ | ||
| {%- endif %} | ||
| dbus \ | ||
| redis-server | ||
|
|
||
| # For sonic-config-engine Python 3 package | ||
| # Install pyangbind here, outside sonic-config-engine dependencies, as pyangbind causes enum34 to be installed. | ||
|
|
@@ -150,7 +113,7 @@ RUN pip{% if 'py3' in whl %}3{% else %}2{% endif %} install python-wheels/{{ whl | |
|
|
||
| # Clean up | ||
| RUN apt-get purge -y build-essential libssl-dev swig | ||
| RUN apt-get purge -y python3-dev | ||
| RUN apt-get purge -y libcairo2-dev libdbus-1-dev libgirepository1.0-dev libsystemd-dev pkg-config | ||
| RUN apt-get clean -y | ||
| RUN apt-get autoclean -y | ||
|
|
@@ -196,9 +159,6 @@ RUN rm -f /usr/share/sonic/templates/supervisord.conf.j2 | |
| RUN mkdir -p /var/log/asan | ||
| {%- endif %} | ||
|
|
||
| RUN echo "docker-sonic-vs" > /etc/hostname | ||
| RUN mkdir -p /etc/quagga | ||
| RUN touch /etc/quagga/zebra.conf | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}} | ||
|
|
||
| ARG docker_container_name | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,13 @@ | ||
| # iproute2 package | ||
|
|
||
| IPROUTE2_VERSION = 5.10.0 | ||
| IPROUTE2_VERSION_FULL = $(IPROUTE2_VERSION)-4 | ||
| IPROUTE2_VERSION_SONIC = $(IPROUTE2_VERSION)-4sonic1 | ||
|
|
||
| export IPROUTE2_VERSION | ||
| export IPROUTE2_VERSION_FULL | ||
| export IPROUTE2_VERSION_SONIC | ||
|
|
||
| IPROUTE2 = iproute2_$(IPROUTE2_VERSION_SONIC)_$(CONFIGURED_ARCH).deb | ||
| $(IPROUTE2)_SRC_PATH = $(SRC_PATH)/iproute2 | ||
| SONIC_MAKE_DEBS += $(IPROUTE2) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Curious why
$(SWSS)is removed here? Is it because it's now taken care of in the addition on line 46?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.
Yes,
docker-sonic-vswill be based on top ofdocker-swss-layer-bullseye, which will contain SWSS.The initial intention of that layer was to save space by having SWSS be in a single layer and then other containers can be built on top of this layer. In this case, since
docker-sonic-vswon't actually be part of the SONiC image, there's effectively no impact.