matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[database-docker]: update multiBD config file (#3487)

Browse Source 
adding 'hostname' field and rename 'socket'
This commit is contained in:
Dong Zhang 2019-09-21 00:34:32 +08:00 committed by lguohan
parent 766b15d11d
commit dd4a50dd61
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dockers/docker-database/database_config.json
View File

@ -1,8 +1,9 @@
{ {
"INSTANCES": { "INSTANCES": {
"redis":{ "redis":{
"port": 6379, "hostname" : "127.0.0.1",
"socket": "/var/run/redis/redis.sock" "port" : 6379,
"unix_socket_path" : "/var/run/redis/redis.sock"
} }
}, },
"DATABASES" : { "DATABASES" : {
@ -37,6 +38,10 @@
"STATE_DB" : { "STATE_DB" : {
"id" : 6, "id" : 6,
"instance" : "redis" "instance" : "redis"
},
"SNMP_OVERLAY_DB" : {
"id" : 7,
"instance" : "redis"
} }
}, },
"VERSION" : "1.0" "VERSION" : "1.0"

2
dockers/docker-database/supervisord.conf.j2
View File

@ -14,7 +14,7 @@ stderr_logfile=syslog
{% if INSTANCES %} {% if INSTANCES %}
{% for redis_inst, redis_items in INSTANCES.iteritems() %} {% for redis_inst, redis_items in INSTANCES.iteritems() %}
[program: {{ redis_inst }}] [program: {{ redis_inst }}]
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 --port {{ redis_items['port'] }} --unixsocket {{ redis_items['socket'] }} --pidfile /var/run/redis/{{ redis_inst }}.pid --dir /var/lib/{{ redis_inst }}" 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 --port {{ redis_items['port'] }} --unixsocket {{ redis_items['unix_socket_path'] }} --pidfile /var/run/redis/{{ redis_inst }}.pid --dir /var/lib/{{ redis_inst }}"
priority=2 priority=2
autostart=true autostart=true
autorestart=false autorestart=false