From 9bf3055f1ff3477c091967d2c808be06824d5af1 Mon Sep 17 00:00:00 2001
From: Mikhail Trubnikov <ivc_trubnikovme@dvgd.rzd>
Date: Thu, 30 Nov 2023 11:18:39 +1000
Subject: [PATCH] fix(api): docker compose redis

---
 docker-compose.yml | 41 +++++++++++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index e51a52d7..0ea3707d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,25 +25,42 @@ services:
     networks:
       parr-network:
 
-  #REDIS
+  # REDIS STACK
   parr-redis:
-    image: redis:7.2.3
+    image: redis/redis-stack:7.2.0-v6
     restart: always
     ports:
       - 6379:6379
-    #command: redis-server /usr/local/etc/redis/redis.conf
     volumes:
       - parr_redis_data:/data
       #- parr_redis_config/redis.conf:/usr/local/etc/redis/redis.conf
     environment:
-      - REDIS_PASSWORD=ParrP@ssPtk202MMdevDvs
-      - REDIS_PORT=6379
-      - REDIS_DATABASES=16
+      - REDIS_ARGS="--requirepass ParrP@ssPtk202MMdevDvs"
     deploy:
       replicas: 1
     networks:
       parr-network:
 
+
+  # #REDIS
+  # parr-redis:
+  #   image: redis:7.2.3
+  #   restart: always
+  #   ports:
+  #     - 6379:6379
+  #   #command: redis-server /usr/local/etc/redis/redis.conf
+  #   volumes:
+  #     - parr_redis_data:/data
+  #     #- parr_redis_config/redis.conf:/usr/local/etc/redis/redis.conf
+  #   environment:
+  #     - REDIS_PASSWORD=ParrP@ssPtk202MMdevDvs
+  #     - REDIS_PORT=6379
+  #     - REDIS_DATABASES=16
+  #   deploy:
+  #     replicas: 1
+  #   networks:
+  #     parr-network:
+
 networks:
   parr-network:
     driver: overlay
@@ -56,12 +73,12 @@ volumes:
       type: "nfs"
       o: "addr=dvgd-appfs-01.dvgd.oao.rzd,soft,rw,nfsvers=4"
       device: ":/nfs/dvgd-swarm-01/parr_redis/data"
-  parr_redis_config:
-    name: parr_redis_config
-    driver_opts:
-      type: "nfs"
-      o: "addr=dvgd-appfs-01.dvgd.oao.rzd,soft,rw,nfsvers=4"
-      device: ":/nfs/dvgd-swarm-01/parr_redis/config"
+  # parr_redis_config:
+  #   name: parr_redis_config
+  #   driver_opts:
+  #     type: "nfs"
+  #     o: "addr=dvgd-appfs-01.dvgd.oao.rzd,soft,rw,nfsvers=4"
+  #     device: ":/nfs/dvgd-swarm-01/parr_redis/config"
   #parr_storage_dev:
     #name: parr_storage_dev
     #driver: local