#16466 fixing based on review comments:

To add the rdbtools into base docker. Remove sudo in saidump.sh
sonic-net · Sep 27, 2023 · 65fc011 · 65fc011
1 parent f2215ec
commit 65fc011
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/dockers/docker-base-bullseye/Dockerfile.j2 b/dockers/docker-base-bullseye/Dockerfile.j2
@@ -83,6 +83,18 @@ 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 remove build-essential libc6-dev python3-dev
+
 RUN apt-get -y purge   \
     exim4              \
     exim4-base         \

diff --git a/files/scripts/saidump.sh b/files/scripts/saidump.sh
@@ -24,8 +24,8 @@ save_saidump_by_rdb() {
   debug "saidump.sh: [4] Run saidump -r to update the JSON files' format as same as the saidump before. Then we can get the saidump's result in standard output."
   docker exec syncd$DEV sh -c "saidump -r /var/run/redis$DEV/dump.json -m 100"
   debug "saidump.sh: [5] Clear temporary files."
-  sudo rm -f /var/run/redis$DEV/dump.rdb
-  sudo rm -f /var/run/redis$DEV/dump.json
+  rm -f /var/run/redis$DEV/dump.rdb
+  rm -f /var/run/redis$DEV/dump.json
 }
 
 NUM_ASICS=`python -c 'from sonic_py_common.multi_asic import get_num_asics; print(get_num_asics())'`

diff --git a/platform/broadcom/docker-syncd-brcm-dnx/Dockerfile.j2 b/platform/broadcom/docker-syncd-brcm-dnx/Dockerfile.j2
@@ -23,18 +23,6 @@ RUN apt-get install -yf kmod
 ## BRCM uses ethtool to set host interface speed
 RUN apt-get install -y ethtool
 
-## 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 remove build-essential libc6-dev python3-dev
-
 COPY ["files/dsserve", "files/bcmcmd", "start.sh", "start_led.sh", "bcmsh", "/usr/bin/"]
 RUN chmod +x /usr/bin/dsserve /usr/bin/bcmcmd