From 7d43c4258aa7792333fe3cdb6730e180f081327f Mon Sep 17 00:00:00 2001 From: zbud-msft Date: Thu, 4 Aug 2022 03:20:35 +0000 Subject: [PATCH 1/6] Add dependencies to sonic-slave docker files --- sonic-slave-buster/Dockerfile.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2 index b89d44656d3..644d9547572 100644 --- a/sonic-slave-buster/Dockerfile.j2 +++ b/sonic-slave-buster/Dockerfile.j2 @@ -142,6 +142,8 @@ RUN apt-get update && apt-get install -y \ dh-systemd \ libzmq5 \ libzmq3-dev \ + uuid-dev \ + libboost-serialization-dev \ jq \ # For quagga build libreadline-dev \ From 1ef5b43d4c57525e4dea1d51e21c17c4d21f0be6 Mon Sep 17 00:00:00 2001 From: zbud-msft Date: Thu, 4 Aug 2022 03:23:03 +0000 Subject: [PATCH 2/6] Add libs to sonic-slave-bullseye --- sonic-slave-bullseye/Dockerfile.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sonic-slave-bullseye/Dockerfile.j2 b/sonic-slave-bullseye/Dockerfile.j2 index 2258946c781..2ba1735ee54 100644 --- a/sonic-slave-bullseye/Dockerfile.j2 +++ b/sonic-slave-bullseye/Dockerfile.j2 @@ -140,6 +140,8 @@ RUN apt-get update && apt-get install -y \ libswitch-perl \ libzmq5 \ libzmq3-dev \ + uuid-dev \ + libboost-serialization-dev \ jq \ cron \ # For quagga build From b142256d17c7d94a223dbfce31504a60ed113392 Mon Sep 17 00:00:00 2001 From: zbud-msft Date: Thu, 4 Aug 2022 04:40:15 +0000 Subject: [PATCH 3/6] Add unmet dependencies --- sonic-slave-bullseye/Dockerfile.j2 | 3 ++- sonic-slave-buster/Dockerfile.j2 | 3 ++- sonic-slave-stretch/Dockerfile.j2 | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sonic-slave-bullseye/Dockerfile.j2 b/sonic-slave-bullseye/Dockerfile.j2 index 2ba1735ee54..c599595a56a 100644 --- a/sonic-slave-bullseye/Dockerfile.j2 +++ b/sonic-slave-bullseye/Dockerfile.j2 @@ -141,7 +141,8 @@ RUN apt-get update && apt-get install -y \ libzmq5 \ libzmq3-dev \ uuid-dev \ - libboost-serialization-dev \ + libboost-serialization1.67-dev \ + libboost-serialization1.71.0 \ jq \ cron \ # For quagga build diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2 index 644d9547572..e936d3480a8 100644 --- a/sonic-slave-buster/Dockerfile.j2 +++ b/sonic-slave-buster/Dockerfile.j2 @@ -143,7 +143,8 @@ RUN apt-get update && apt-get install -y \ libzmq5 \ libzmq3-dev \ uuid-dev \ - libboost-serialization-dev \ + libboost-serialization1.67-dev \ + libboost-serialization1.71.0 \ jq \ # For quagga build libreadline-dev \ diff --git a/sonic-slave-stretch/Dockerfile.j2 b/sonic-slave-stretch/Dockerfile.j2 index e3815eab2d3..34f92ef802f 100644 --- a/sonic-slave-stretch/Dockerfile.j2 +++ b/sonic-slave-stretch/Dockerfile.j2 @@ -80,6 +80,8 @@ RUN apt-get update && apt-get install -y \ dh-systemd \ libzmq5 \ libzmq3-dev \ + libboost-serialization1.67-dev \ + libboost-serialization1.71.0 \ jq \ # For quagga build libreadline-dev \ From a6fa84a6e629366d98e58c72dc8d787ef32f80a7 Mon Sep 17 00:00:00 2001 From: zbud-msft Date: Thu, 4 Aug 2022 04:52:51 +0000 Subject: [PATCH 4/6] Change version of lib --- sonic-slave-bullseye/Dockerfile.j2 | 3 +-- sonic-slave-buster/Dockerfile.j2 | 3 +-- sonic-slave-stretch/Dockerfile.j2 | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sonic-slave-bullseye/Dockerfile.j2 b/sonic-slave-bullseye/Dockerfile.j2 index c599595a56a..e3169f88820 100644 --- a/sonic-slave-bullseye/Dockerfile.j2 +++ b/sonic-slave-bullseye/Dockerfile.j2 @@ -141,8 +141,6 @@ RUN apt-get update && apt-get install -y \ libzmq5 \ libzmq3-dev \ uuid-dev \ - libboost-serialization1.67-dev \ - libboost-serialization1.71.0 \ jq \ cron \ # For quagga build @@ -399,6 +397,7 @@ RUN apt-get update && apt-get install -y \ libboost-dev \ libboost-program-options-dev \ libboost-system-dev \ + libboost-serialization-dev \ libboost-thread-dev \ libboost-atomic-dev \ libboost-chrono-dev \ diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2 index e936d3480a8..f2a91a27d54 100644 --- a/sonic-slave-buster/Dockerfile.j2 +++ b/sonic-slave-buster/Dockerfile.j2 @@ -143,8 +143,6 @@ RUN apt-get update && apt-get install -y \ libzmq5 \ libzmq3-dev \ uuid-dev \ - libboost-serialization1.67-dev \ - libboost-serialization1.71.0 \ jq \ # For quagga build libreadline-dev \ @@ -409,6 +407,7 @@ RUN apt-get update && apt-get install -y \ libbz2-dev \ # For linkmgrd libboost1.71-dev \ + libboost-serialization1.71-dev \ libboost-program-options1.71-dev \ libboost-system1.71-dev \ libboost-thread1.71-dev \ diff --git a/sonic-slave-stretch/Dockerfile.j2 b/sonic-slave-stretch/Dockerfile.j2 index 34f92ef802f..e3815eab2d3 100644 --- a/sonic-slave-stretch/Dockerfile.j2 +++ b/sonic-slave-stretch/Dockerfile.j2 @@ -80,8 +80,6 @@ RUN apt-get update && apt-get install -y \ dh-systemd \ libzmq5 \ libzmq3-dev \ - libboost-serialization1.67-dev \ - libboost-serialization1.71.0 \ jq \ # For quagga build libreadline-dev \ From f8b2483b13ddf684aa12567ce8fe0cfea908282d Mon Sep 17 00:00:00 2001 From: zbud-msft Date: Fri, 5 Aug 2022 18:15:17 +0000 Subject: [PATCH 5/6] Add libboost-serialization lib to docker-sonic-vs --- platform/vs/docker-sonic-vs/Dockerfile.j2 | 1 + 1 file changed, 1 insertion(+) diff --git a/platform/vs/docker-sonic-vs/Dockerfile.j2 b/platform/vs/docker-sonic-vs/Dockerfile.j2 index 70ac1d9da8d..ae0be437ef6 100644 --- a/platform/vs/docker-sonic-vs/Dockerfile.j2 +++ b/platform/vs/docker-sonic-vs/Dockerfile.j2 @@ -23,6 +23,7 @@ RUN apt-get install -y net-tools \ libqt5core5a \ libqt5network5 \ libboost-program-options1.71.0 \ + libboost-serialization1.71.0 \ libboost-system1.71.0 \ libboost-thread1.71.0 \ libgmp10 \ From 5aafc3f8d14d9af3e030cea1ddd613bfba51dc10 Mon Sep 17 00:00:00 2001 From: zbud-msft Date: Fri, 5 Aug 2022 18:31:26 +0000 Subject: [PATCH 6/6] Add other libs to dockerfile --- platform/vs/docker-sonic-vs/Dockerfile.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/platform/vs/docker-sonic-vs/Dockerfile.j2 b/platform/vs/docker-sonic-vs/Dockerfile.j2 index ae0be437ef6..6594630cc20 100644 --- a/platform/vs/docker-sonic-vs/Dockerfile.j2 +++ b/platform/vs/docker-sonic-vs/Dockerfile.j2 @@ -45,6 +45,8 @@ RUN apt-get install -y net-tools \ iptables \ jq \ libzmq5 \ + libzmq3-dev \ + uuid-dev \ # For installing Python m2crypto package # (these can be uninstalled after installation) build-essential \