Skip to content

Commit 5030753

Browse files
author
Sabareesh Kumar Anandan
committed
Updated redis version to 6.0.8
Inband fix - SONIC-1100
1 parent af25313 commit 5030753

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

files/mrvl_arm64_build_patch.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ index 1959bb5..dfd98c6 100644
5252
python-meld3 \
5353
# Install redis-tools
5454
- redis-tools=5:6.0.5-1~bpo10+1 \
55-
+ redis-tools \
55+
+ redis-tools=5:6.0.8-1~bpo10+1 \
5656
# common dependencies
5757
libpython2.7 \
5858
libdaemon0 \
@@ -65,7 +65,7 @@ index e14be96..6ffc2c3 100644
6565

6666
# install redis-server
6767
-RUN apt-get install -y redis-server=5:6.0.5-1~bpo10+1
68-
+RUN apt-get install -y redis-server
68+
+RUN apt-get install -y redis-server=5:6.0.8-1~bpo10+1
6969

7070
{% if docker_database_debs.strip() -%}
7171
# Copy locally-built Debian package dependencies

sonic_M0_master_mvl_patch.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ inband_mgmt(){\
196196
if [ $? -eq 0 ]; then\
197197
ip address show eth0 | grep -qw "inet" 2>/dev/null\
198198
if [ $? -ne 0 ]; then\
199+
ifconfig eth0 down\
199200
systemctl restart networking\
200201
fi\
201202
sleep 120\
@@ -300,8 +301,8 @@ sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install wheel'
300301
echo 'sudo sed -i "s/python3.6/python3/g" $FILESYSTEM_ROOT/etc/monit/conf.d/monit_snmp' >> files/build_templates/sonic_debian_extension.j2
301302

302303
# Update redis version
303-
sed -i 's/redis-tools=5:6.0.5-1~bpo10+1/redis-tools/g' dockers/docker-base-buster/Dockerfile.j2
304-
sed -i 's/redis-server=5:6.0.5-1~bpo10+1/redis-server/g' dockers/docker-database/Dockerfile.j2
304+
sed -i 's/redis-tools=5:6.0.5-1~bpo10+1/redis-tools=5:6.0.8-1~bpo10+1/g' dockers/docker-base-buster/Dockerfile.j2
305+
sed -i 's/redis-server=5:6.0.5-1~bpo10+1/redis-server=5:6.0.8-1~bpo10+1/g' dockers/docker-database/Dockerfile.j2
305306

306307
# sonic_generate_dump patch
307308
pushd src/sonic-utilities

0 commit comments

Comments
 (0)