Skip to content

Commit af2d5a4

Browse files
committed
According to the review comments, update the rdb-cli installation location
1 parent 6e5a2d9 commit af2d5a4

File tree

3 files changed

+18
-30
lines changed

3 files changed

+18
-30
lines changed

dockers/docker-base-bookworm/Dockerfile.j2

100644100755
-12
Original file line numberDiff line numberDiff line change
@@ -81,18 +81,6 @@ RUN pip3 install supervisord-dependent-startup==1.4.0
8181

8282
RUN mkdir -p /var/log/supervisor /etc/supervisor/conf.d
8383

84-
# Install gcc, libc6-dev and python3-dev for compiling python-lzf
85-
RUN apt-get -y install build-essential libc6-dev python3-dev
86-
87-
# Install python-lzf
88-
RUN pip3 install 'python-lzf==0.2.4'
89-
90-
# Install rdbtools
91-
RUN pip3 install 'rdbtools==0.1.15'
92-
93-
# Uninstall gcc, libc6-dev and python3-dev for compiling python-lzf
94-
RUN apt-get -y purge build-essential libc6-dev python3-dev
95-
9684
# Uninstall unused dependencies
9785
RUN apt autoremove -y --purge
9886

dockers/docker-base-bullseye/Dockerfile.j2

-18
Original file line numberDiff line numberDiff line change
@@ -83,24 +83,6 @@ RUN pip3 install supervisord-dependent-startup==1.4.0
8383

8484
RUN mkdir -p /var/log/supervisor /etc/supervisor/conf.d
8585

86-
# Install gcc, libc6-dev and git for compiling librdb
87-
RUN apt-get -y install build-essential libc6-dev git
88-
89-
# Obtain librdb source codes
90-
RUN git -C /tmp/ clone https://github.com/redis/librdb.git
91-
92-
# Build librdb
93-
RUN cd /tmp/librdb/;git submodule update --init --recursive;make -j4
94-
95-
# Install rdb-cli
96-
RUN install -p -D -m 0775 /tmp/librdb/bin/rdb-cli /usr/bin/rdb-cli
97-
98-
# Clear librdb source codes
99-
RUN rm -rf /tmp/librdb
100-
101-
# Uninstall gcc, libc6-dev and git for compiling librdb
102-
RUN apt-get -y purge build-essential libc6-dev git
103-
10486
# Uninstall unused dependencies
10587
RUN apt autoremove -y --purge
10688

platform/broadcom/docker-syncd-brcm/Dockerfile.j2

+18
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,24 @@ COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
3030
COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
3131
COPY ["critical_processes", "/etc/supervisor/"]
3232

33+
# Install make and git for compiling librdb
34+
RUN apt-get -y install build-essential git
35+
36+
# Obtain librdb source codes
37+
RUN git clone https://github.com/redis/librdb.git
38+
39+
# Build librdb
40+
RUN cd ./librdb/;git checkout b401df1e7025501c24f0c852aa32f6900fd888f7;git submodule update --init --recursive;make;cd ..
41+
42+
# Install rdb-cli
43+
RUN install -p -D -m 0775 ./librdb/bin/rdb-cli /usr/bin/rdb-cli
44+
45+
# Clear librdb source codes
46+
RUN rm -rf ./librdb
47+
48+
# Uninstall make and git for compiling librdb
49+
RUN apt-get -y purge build-essential git
50+
3351
## Clean up
3452
RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
3553
RUN rm -rf /debs

0 commit comments

Comments
 (0)