diff --git a/README.md b/README.md index f7759631..281a49e9 100644 --- a/README.md +++ b/README.md @@ -29,17 +29,3 @@ - PARR.MockData - загрузка тестовых данных - PARR.Test - тестирование функций ПАРР - -~~## Настройка хранилища~~ - -```bash -#не используется -#dev -\\dvgd-appfs-01\parr_storage_dev -parruserdev -P@ssDevParr202MM - -#dev подключение хранилища -net use w: /d /y -net use w: \\dvgd-appfs-01\parr_storage_dev /USER:parruserdev P@ssDevParr202MM /PERSISTENT:YES -``` diff --git a/docker-compose.yml b/docker-compose.yml index 7322f018..67d7c1b3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -32,8 +32,8 @@ services: ports: - 6379:6379 volumes: - - parr_redis/dаta:/root/redis - - parr_redis/redis.conf:/usr/local/etc/redis/redis.conf + - parr_redis_dаta:/root/redis + - parr_redis_config:/usr/local/etc/redis/redis.conf environment: - REDIS_PASSWORD=ParrP@ssPtk202MMdevDvs - REDIS_PORT=6379 @@ -60,12 +60,18 @@ networks: external: true volumes: - parr_redis: - name: parr_redis + parr_redis_data: + name: parr_redis_data driver_opts: type: "nfs" o: "addr=dvgd-appfs-01.dvgd.oao.rzd,soft,rw,nfsvers=4" - device: ":/nfs/dvgd-swarm-01/parr_redis" + 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_storage_dev: #name: parr_storage_dev #driver: local