Replace valkey with redis in Docker setup

Author: liuh-80

dockers/docker-database/Dockerfile.j2

@@ -38,9 +38,14 @@ RUN apt-get clean -y                                  && \
              s/^notify-keyspace-events ""$/notify-keyspace-events AKE/; \
              s/^databases [0-9]+$/databases 100/ \
              s/^unixsocketgroup wheel/# unixsocketgroup wheel/ \
-             s/^dir /var/lib/valkey/dir /var/lib/redis/ \
+             s/^dir \/var\/lib\/valkey/dir \/var\/lib\/redis/ \
             ' /etc/valkey/valkey.conf
 
+RUN mkdir -p /var/lib/redis
+RUN ln -s /etc/valkey/valkey.conf /etc/redis/redis.conf
+RUN ln -s /usr/bin/valkey-server /usr/bin/redis-server
+RUN ln -s /usr/bin/valkey-cli /usr/bin/redis-cli
+
 COPY ["supervisord.conf.j2", "/usr/share/sonic/templates/"]
 COPY ["critical_processes.j2", "/usr/share/sonic/templates/"]
 COPY ["docker-database-init.sh", "/usr/local/bin/"]

dockers/docker-database/base_image_files/redis-cli

@@ -7,4 +7,4 @@ if [ -t 1 ] ; then
     DOCKER_EXEC_FLAGS+="t"
 fi
 
-docker exec -$DOCKER_EXEC_FLAGS database valkey-cli "$@"
+docker exec -$DOCKER_EXEC_FLAGS database redis-cli "$@"

dockers/docker-database/supervisord.conf.j2

@@ -43,7 +43,7 @@ dependent_startup=true
 {%- set LOOPBACK_IP = '' -%}
 {%- set ADDITIONAL_OPTS = '' %}
 {%- endif -%}
-command=/bin/bash -c "{ [[ -s /var/lib/{{ redis_inst }}/dump.rdb ]] || rm -f /var/lib/{{ redis_inst }}/dump.rdb; } && mkdir -p /var/lib/{{ redis_inst }} && exec /usr/bin/valkey-server /etc/valkey/valkey.conf --bind {{ LOOPBACK_IP }} {{ redis_items['hostname'] }} --port {{ redis_items['port'] }} --unixsocket {{ redis_items['unix_socket_path'] }} --pidfile /var/run/redis/{{ redis_inst }}.pid --dir /var/lib/{{ redis_inst }} {{ ADDITIONAL_OPTS }}"
+command=/bin/bash -c "{ [[ -s /var/lib/{{ redis_inst }}/dump.rdb ]] || rm -f /var/lib/{{ redis_inst }}/dump.rdb; } && mkdir -p /var/lib/{{ redis_inst }} && exec /usr/bin/redis-server /etc/redis/redis.conf --bind {{ LOOPBACK_IP }} {{ redis_items['hostname'] }} --port {{ redis_items['port'] }} --unixsocket {{ redis_items['unix_socket_path'] }} --pidfile /var/run/redis/{{ redis_inst }}.pid --dir /var/lib/{{ redis_inst }} {{ ADDITIONAL_OPTS }}"
 priority=2
 user=redis
 autostart=true