From afcfb10bb2ee8ff951659615475d3ced3a8cd943 Mon Sep 17 00:00:00 2001 From: Sangita Maity Date: Fri, 23 Apr 2021 22:11:52 +0000 Subject: [PATCH 1/3] Build Fix Signed-off-by: Sangita Maity --- sonic-slave-stretch/Dockerfile | 4 ++++ sonic-slave/Dockerfile | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/sonic-slave-stretch/Dockerfile b/sonic-slave-stretch/Dockerfile index 9551e4b4615..a8fe4d26fc5 100644 --- a/sonic-slave-stretch/Dockerfile +++ b/sonic-slave-stretch/Dockerfile @@ -230,6 +230,10 @@ RUN pip install pyangbind==0.5.10 # For supervisor build RUN pip install meld3 mock +# For swsssdk build +RUN pip2 install redis==2.10.6 +RUN pip3 install redis==2.10.6 + # Install dependencies for isc-dhcp-relay build RUN apt-get -y build-dep isc-dhcp diff --git a/sonic-slave/Dockerfile b/sonic-slave/Dockerfile index 769e7a56560..cbd1848551a 100644 --- a/sonic-slave/Dockerfile +++ b/sonic-slave/Dockerfile @@ -288,6 +288,10 @@ RUN pip install setuptools==40.8.0 # For sonic-swss-common testing RUN pip install Pympler==0.8 +# For swsssdk build +RUN pip2 install redis==2.10.6 +RUN pip3 install redis==2.10.6 + # Install dependencies for isc-dhcp-relay build RUN apt-get -y build-dep isc-dhcp From bd9a9d50b3a001403d632bc3672d366d240c6df7 Mon Sep 17 00:00:00 2001 From: Ying Xie Date: Wed, 28 Apr 2021 22:40:11 -0700 Subject: [PATCH 2/3] No need to change stretch docker. --- sonic-slave-stretch/Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sonic-slave-stretch/Dockerfile b/sonic-slave-stretch/Dockerfile index a8fe4d26fc5..9551e4b4615 100644 --- a/sonic-slave-stretch/Dockerfile +++ b/sonic-slave-stretch/Dockerfile @@ -230,10 +230,6 @@ RUN pip install pyangbind==0.5.10 # For supervisor build RUN pip install meld3 mock -# For swsssdk build -RUN pip2 install redis==2.10.6 -RUN pip3 install redis==2.10.6 - # Install dependencies for isc-dhcp-relay build RUN apt-get -y build-dep isc-dhcp From bbb5c0ff21789d392c027dd55a7611081d7b7da2 Mon Sep 17 00:00:00 2001 From: Ying Xie Date: Wed, 28 Apr 2021 22:41:13 -0700 Subject: [PATCH 3/3] Install nose==1.3.7 explicitly for mockredispy --- sonic-slave/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/sonic-slave/Dockerfile b/sonic-slave/Dockerfile index cbd1848551a..89ab7148f59 100644 --- a/sonic-slave/Dockerfile +++ b/sonic-slave/Dockerfile @@ -281,6 +281,7 @@ RUN pip install meld3 mock RUN pip install pexpect==4.6.0 # For sonic-utilities build +RUN pip install nose==1.3.7 RUN pip install mockredispy==2.9.3 RUN pip install pytest-runner==4.4 RUN pip install setuptools==40.8.0