Skip to content

Commit e9576eb

Browse files
authored
[Marvell] Move armhf syncd docker to bullseye. (#12585)
Why I did it Move armhf syncd docker compilation to bullseye. How I did it compile syncd docker for armhf platform using below commands, NOJESSIE=1 NOSTRETCH=1 NOBUSTER=1 BLDENV=bullseye make configure PLATFORM=marvell-armhf PLATFORM_ARCH=armhf NOJESSIE=1 NOSTRETCH=1 NOBUSTER=1 BLDENV=bullseye make target/docker-syncd-mrvl.gz How to verify it upgrade the syncd docker and verify ports are up. Signed-off-by: rajkumar38 <rpennadamram@marvell.com>
1 parent 6f0b059 commit e9576eb

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

platform/marvell-armhf/docker-saiserver-mrvl.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ DOCKER_SAISERVER_MRVL = docker-saiserver-mrvl.gz
44
$(DOCKER_SAISERVER_MRVL)_PATH = $(PLATFORM_PATH)/docker-saiserver-mrvl
55
$(DOCKER_SAISERVER_MRVL)_DEPENDS += $(SAISERVER)
66
$(DOCKER_SAISERVER_MRVL)_FILES += $(DSSERVE) $(BCMCMD)
7-
$(DOCKER_SAISERVER_MRVL)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BUSTER)
7+
$(DOCKER_SAISERVER_MRVL)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BULLSEYE)
88
SONIC_DOCKER_IMAGES += $(DOCKER_SAISERVER_MRVL)
99

1010
$(DOCKER_SAISERVER_MRVL)_CONTAINER_NAME = saiserver

platform/marvell-armhf/docker-syncd-mrvl-rpc/Dockerfile.j2

+6-5
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ RUN apt-get purge -y syncd
1515
RUN apt-get update \
1616
&& apt-get -y install \
1717
net-tools \
18-
python-pip \
18+
python3-pip \
19+
python-setuptools \
1920
build-essential \
2021
libssl-dev \
2122
libffi-dev \
@@ -24,7 +25,7 @@ RUN apt-get update \
2425
cmake \
2526
libqt5core5a \
2627
libqt5network5 \
27-
libboost-atomic1.71.0
28+
libboost-atomic1.74.0
2829

2930
RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
3031
{% for deb in docker_syncd_mrvl_rpc_debs.split(' ') -%}
@@ -41,9 +42,9 @@ RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
4142
&& cd .. \
4243
&& rm -fr nanomsg-1.0.0 \
4344
&& rm -f 1.0.0.tar.gz \
44-
&& pip install cffi==1.7.0 \
45-
&& pip install --upgrade cffi==1.7.0 \
46-
&& pip install nnpy \
45+
&& pip2 install cffi==1.7.0 \
46+
&& pip2 install --upgrade cffi==1.7.0 \
47+
&& pip2 install nnpy \
4748
&& mkdir -p /opt \
4849
&& cd /opt \
4950
&& wget https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py \

platform/marvell-armhf/docker-syncd-mrvl.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# docker image for mrvl syncd
22

33
DOCKER_SYNCD_PLATFORM_CODE = mrvl
4-
include $(PLATFORM_PATH)/../template/docker-syncd-base.mk
4+
include $(PLATFORM_PATH)/../template/docker-syncd-bullseye.mk
55

66
$(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD)
77

platform/marvell-armhf/docker-syncd-mrvl/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% from "dockers/dockerfile-macros.j2" import install_debian_packages %}
2-
FROM docker-config-engine-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
2+
FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
55

0 commit comments

Comments
 (0)