Unverified Commit 503a279c authored by Nick Craver's avatar Nick Craver Committed by GitHub

Misc fixes for Docker around Sentinel (#1391)

Found while fixing up runs for #1067. Docker layer cache sucks :)
parent a5017f6a
...@@ -4,6 +4,7 @@ if [ "$#" -ne 0 ]; then ...@@ -4,6 +4,7 @@ if [ "$#" -ne 0 ]; then
exec "$@" exec "$@"
else else
mkdir -p /var/log/supervisor mkdir -p /var/log/supervisor
mkdir Temp/
supervisord -c /etc/supervisord.conf supervisord -c /etc/supervisord.conf
sleep 3 sleep 3
......
port 7010 port 7010
repl-diskless-sync yes
repl-diskless-sync-delay 0
maxmemory 100mb maxmemory 100mb
appendonly no appendonly no
dir "../Temp" dir "../Temp"
......
port 7011 port 7011
slaveof 127.0.0.1 7010
repl-diskless-sync yes
repl-diskless-sync-delay 0
maxmemory 100mb maxmemory 100mb
appendonly no appendonly no
dir "../Temp" dir "../Temp"
dbfilename "sentinel-target-7011.rdb" dbfilename "sentinel-target-7011.rdb"
save "" save ""
slaveof 127.0.0.1 7010 \ No newline at end of file
\ No newline at end of file
port 26379 port 26379
sentinel monitor mymaster 127.0.0.1 7010 1 sentinel monitor mymaster 127.0.0.1 7010 1
sentinel down-after-milliseconds mymaster 1000 sentinel down-after-milliseconds mymaster 1000
sentinel failover-timeout mymaster 2000 sentinel failover-timeout mymaster 1000
sentinel config-epoch mymaster 0 sentinel config-epoch mymaster 0
dir "../Temp" dir "../Temp"
\ No newline at end of file
port 26380 port 26380
sentinel monitor mymaster 127.0.0.1 7010 1 sentinel monitor mymaster 127.0.0.1 7010 1
sentinel down-after-milliseconds mymaster 1000 sentinel down-after-milliseconds mymaster 1000
sentinel failover-timeout mymaster 2000 sentinel failover-timeout mymaster 1000
sentinel config-epoch mymaster 0 sentinel config-epoch mymaster 0
dir "../Temp" dir "../Temp"
\ No newline at end of file
port 26381 port 26381
sentinel monitor mymaster 127.0.0.1 7011 2 sentinel monitor mymaster 127.0.0.1 7011 2
sentinel down-after-milliseconds mymaster 1000 sentinel down-after-milliseconds mymaster 1000
sentinel failover-timeout mymaster 2000 sentinel failover-timeout mymaster 1000
sentinel config-epoch mymaster 21 sentinel config-epoch mymaster 0
dir "../Temp/sentinel-26381" dir "../Temp"
...@@ -11,3 +11,5 @@ services: ...@@ -11,3 +11,5 @@ services:
- 7000-7006:7000-7006 - 7000-7006:7000-7006
- 7010-7011:7010-7011 - 7010-7011:7010-7011
- 26379-26381:26379-26381 - 26379-26381:26379-26381
sysctls :
net.core.somaxconn: '511'
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment