According to the review comments, update the rdb-cli installation loc…

…ation
sonic-net · Oct 23, 2024 · af2d5a4 · af2d5a4
1 parent 6e5a2d9
commit af2d5a4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 30 deletions.
diff --git a/dockers/docker-base-bookworm/Dockerfile.j2 b/dockers/docker-base-bookworm/Dockerfile.j2
@@ -81,18 +81,6 @@ RUN pip3 install supervisord-dependent-startup==1.4.0
 
 RUN mkdir -p /var/log/supervisor /etc/supervisor/conf.d
 
-# Install gcc, libc6-dev and python3-dev for compiling python-lzf
-RUN apt-get -y install build-essential libc6-dev python3-dev
-
-# Install python-lzf
-RUN pip3 install 'python-lzf==0.2.4'
-
-# Install rdbtools
-RUN pip3 install 'rdbtools==0.1.15'
-
-# Uninstall gcc, libc6-dev and python3-dev for compiling python-lzf
-RUN apt-get -y purge build-essential libc6-dev python3-dev
-
 # Uninstall unused dependencies
 RUN apt autoremove -y --purge
 

diff --git a/dockers/docker-base-bullseye/Dockerfile.j2 b/dockers/docker-base-bullseye/Dockerfile.j2
@@ -83,24 +83,6 @@ RUN pip3 install supervisord-dependent-startup==1.4.0
 
 RUN mkdir -p /var/log/supervisor /etc/supervisor/conf.d
 
-# Install gcc, libc6-dev and git for compiling librdb
-RUN apt-get -y install build-essential libc6-dev git
-
-# Obtain librdb source codes
-RUN git -C /tmp/ clone https://github.com/redis/librdb.git
-
-# Build librdb
-RUN cd /tmp/librdb/;git submodule update --init --recursive;make -j4
-
-# Install rdb-cli
-RUN install -p -D -m 0775 /tmp/librdb/bin/rdb-cli /usr/bin/rdb-cli
-
-# Clear librdb source codes
-RUN rm -rf /tmp/librdb
-
-# Uninstall gcc, libc6-dev and git for compiling librdb
-RUN apt-get -y purge build-essential libc6-dev git
-
 # Uninstall unused dependencies
 RUN apt autoremove -y --purge
 

diff --git a/platform/broadcom/docker-syncd-brcm/Dockerfile.j2 b/platform/broadcom/docker-syncd-brcm/Dockerfile.j2
@@ -30,6 +30,24 @@ COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
 COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
 COPY ["critical_processes", "/etc/supervisor/"]
 
+# Install make and git for compiling librdb
+RUN apt-get -y install build-essential git
+
+# Obtain librdb source codes
+RUN git clone https://github.com/redis/librdb.git
+
+# Build librdb
+RUN cd ./librdb/;git checkout b401df1e7025501c24f0c852aa32f6900fd888f7;git submodule update --init --recursive;make;cd ..
+
+# Install rdb-cli
+RUN install -p -D -m 0775 ./librdb/bin/rdb-cli /usr/bin/rdb-cli
+
+# Clear librdb source codes
+RUN rm -rf ./librdb
+
+# Uninstall make and git for compiling librdb
+RUN apt-get -y purge build-essential git
+
 ## Clean up
 RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
 RUN rm -rf /debs