Fixed swss-common dependencies

Signed-off-by: Andriy Kokhan <[email protected]>
opencomputeproject · Nov 17, 2023 · e6166d4 · e6166d4
1 parent 49c7ffc
commit e6166d4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/dockerfiles/bullseye/Dockerfile b/dockerfiles/bullseye/Dockerfile
@@ -34,7 +34,8 @@ RUN apt-get install -y \
         make libtool m4 autoconf dh-exec debhelper automake cmake pkg-config \
         libhiredis-dev libnl-3-dev libnl-genl-3-dev libnl-route-3-dev swig \
         libgtest-dev libgmock-dev libboost-dev autoconf-archive \
-        uuid-dev libboost-serialization-dev libyang-dev libyang1
+        uuid-dev libboost-serialization-dev libyang-dev libyang1 \
+        nlohmann-json3-dev
 
 RUN apt-get install -y \
         libnl-3-dev libnl-genl-3-dev libnl-route-3-dev libnl-nf-3-dev libzmq3-dev
@@ -98,7 +99,6 @@ RUN echo "#mock" > /ptf/ptf && pip3 install /ptf
 
 # Install SAI attributes metadata JSON generator
 COPY scripts/gen_attr_list /sai/gen_attr_list
-RUN apt-get install -y nlohmann-json3-dev
 
 # Install SAI-C dependencies
 RUN pip3 install pytest pytest_dependency pytest-html aenum pdbpp macaddress click==8.0

diff --git a/dockerfiles/buster/Dockerfile b/dockerfiles/buster/Dockerfile
@@ -38,9 +38,10 @@ RUN apt-get install -y redis-server libhiredis0.14 libc-ares2
 # Install sonic-swss-common & sonic-sairedis building dependencies
 RUN apt-get install -y \
         make libtool m4 autoconf dh-exec debhelper automake cmake pkg-config \
-        libhiredis-dev libnl-3-dev libnl-genl-3-dev libnl-route-3-dev swig3.0 \
+        libhiredis-dev libnl-3-dev libnl-genl-3-dev libnl-route-3-dev swig \
         libgtest-dev libgmock-dev libboost-dev autoconf-archive \
-        uuid-dev libboost-serialization-dev libyang-dev libyang1
+        uuid-dev libboost-serialization-dev libyang-dev libyang1 \
+        nlohmann-json3-dev
 
 RUN apt-get install -y \
         libnl-3-dev libnl-genl-3-dev libnl-route-3-dev libnl-nf-3-dev libzmq3-dev
@@ -104,7 +105,6 @@ RUN echo "#mock" > /ptf/ptf && pip3 install /ptf
 
 # Install SAI attributes metadata JSON generator
 COPY scripts/gen_attr_list /sai/gen_attr_list
-RUN apt-get install -y nlohmann-json3-dev
 
 # Install SAI-C dependencies
 RUN pip3 install pytest pytest_dependency pytest-html aenum pdbpp macaddress click==8.0

diff --git a/dockerfiles/buster/Dockerfile.server b/dockerfiles/buster/Dockerfile.server
@@ -38,7 +38,7 @@ RUN apt-get install -y redis-server libhiredis0.14 libc-ares2
 # Install sonic-swss-common & sonic-sairedis building dependencies
 RUN apt-get install -y \
         make libtool m4 autoconf dh-exec debhelper automake cmake pkg-config \
-        libhiredis-dev libnl-3-dev libnl-genl-3-dev libnl-route-3-dev swig3.0 \
+        libhiredis-dev libnl-3-dev libnl-genl-3-dev libnl-route-3-dev swig \
         libgtest-dev libgmock-dev libboost-dev autoconf-archive \
         uuid-dev libboost-serialization-dev libyang-dev libyang1 \
         nlohmann-json3-dev