From 1c901b8f12cfa2c7f56fa0da62e93a7f7abc7e0c Mon Sep 17 00:00:00 2001 From: Ze Gan Date: Fri, 2 Feb 2024 03:13:51 +0800 Subject: [PATCH] [docker-database]: Install sonic-dash-api CLI in database container (#17479) Add sonic-dash-api CLI in database container for decoding the dash objects from protobuf to readable json. Signed-off-by: Ze Gan --- .azure-pipelines/azure-pipelines-build-ubuntu-2004.yml | 3 ++- dockers/docker-database/Dockerfile.j2 | 3 +++ rules/docker-database.mk | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-build-ubuntu-2004.yml b/.azure-pipelines/azure-pipelines-build-ubuntu-2004.yml index e2aa48057..f3c966c86 100644 --- a/.azure-pipelines/azure-pipelines-build-ubuntu-2004.yml +++ b/.azure-pipelines/azure-pipelines-build-ubuntu-2004.yml @@ -29,7 +29,8 @@ stages: debhelper-compat dh-elpa dh-sequence-python3 python3-all \ libpython3-all-dev python3-six xmlto unzip rake-compiler gem2deb pkg-php-tools \ ant default-jdk maven-repo-helper libguava-java \ - libboost-all-dev libgtest-dev build-essential + libboost-all-dev libgtest-dev build-essential swig4.0 swig + sudo pip3 install pytest click wget http://ftp.us.debian.org/debian/pool/main/libg/libgoogle-gson-java/libgoogle-gson-java_2.8.6-1+deb11u1_all.deb sudo dpkg -i libgoogle-gson-java_2.8.6-1+deb11u1_all.deb mkdir -p /tmp/artifacts diff --git a/dockers/docker-database/Dockerfile.j2 b/dockers/docker-database/Dockerfile.j2 index 22e88275e..3b0de019e 100644 --- a/dockers/docker-database/Dockerfile.j2 +++ b/dockers/docker-database/Dockerfile.j2 @@ -12,6 +12,9 @@ RUN apt-get update # Install redis-server RUN apt-get install -y redis-tools redis-server +# Install click for CLI +RUN pip3 install click + {% if docker_database_debs.strip() -%} # Copy locally-built Debian package dependencies {{ copy_files("debs/", docker_database_debs.split(' '), "/debs/") }} diff --git a/rules/docker-database.mk b/rules/docker-database.mk index 888031a7b..5fb090835 100644 --- a/rules/docker-database.mk +++ b/rules/docker-database.mk @@ -5,7 +5,8 @@ DOCKER_DATABASE = $(DOCKER_DATABASE_STEM).gz DOCKER_DATABASE_DBG = $(DOCKER_DATABASE_STEM)-$(DBG_IMAGE_MARK).gz $(DOCKER_DATABASE)_DEPENDS += $(LIBSWSSCOMMON) \ - $(SONIC_DB_CLI) + $(SONIC_DB_CLI) \ + $(LIB_SONIC_DASH_API) $(DOCKER_DATABASE)_PATH = $(DOCKERS_PATH)/$(DOCKER_DATABASE_STEM)