Merge branch 'dockerize' of github.com:abrookins/redis-py into dockerize

10 files changed, 30 insertions, 43 deletions

diff --git a/docker/master/Dockerfile b/docker/master/Dockerfile
index af81fb3..1f4bd73 100644
--- a/docker/master/Dockerfile
+++ b/docker/master/Dockerfile
@@ -1,7 +1,7 @@
 FROM redis-py-base:latest
 
-COPY redis.conf /etc/conf/redis/redis.conf
+COPY redis.conf /usr/local/etc/redis/redis.conf
 
 EXPOSE 6379
 
-CMD redis-server
+CMD [ "redis-server", "/usr/local/etc/redis/redis.conf" ]
diff --git a/docker/master/redis.conf b/docker/master/redis.conf
index cd1c984..ed00766 100644
--- a/docker/master/redis.conf
+++ b/docker/master/redis.conf
@@ -1,9 +1,3 @@
-pidfile /var/run/redis-master.pid
-bind *
+bind master 127.0.0.1
 port 6379
-daemonize yes
-unixsocket /tmp/redis_master.sock
-unixsocketperm 777
-dbfilename master.rdb
-dir /var/lib/redis/backups
-logfile /var/log/redis-master
+save ""
diff --git a/docker/sentinel_1/Dockerfile b/docker/sentinel_1/Dockerfile
index e3c3e7b..3c3f8c2 100644
--- a/docker/sentinel_1/Dockerfile
+++ b/docker/sentinel_1/Dockerfile
@@ -1,7 +1,7 @@
 FROM redis-py-base:latest
 
-COPY redis.conf /etc/conf/redis/redis.conf
+COPY redis.conf /usr/local/etc/redis/redis.conf
 
 EXPOSE 26379
 
-CMD redis-server
+CMD [ "redis-sentinel", "/usr/local/etc/redis/redis.conf" ]
diff --git a/docker/sentinel_1/redis.conf b/docker/sentinel_1/redis.conf
index d12979f..fc9aa68 100644
--- a/docker/sentinel_1/redis.conf
+++ b/docker/sentinel_1/redis.conf
@@ -1,7 +1,7 @@
-pidfile /var/run/sentinel-1.pid
+bind sentinel_1 127.0.0.1
 port 26379
-daemonize yes
-logfile /var/log/redis-sentinel-1
 
-# short timeout for sentinel tests
-sentinel down-after-milliseconds mymaster 500
+sentinel monitor redis-py-test master 6379 2
+sentinel down-after-milliseconds redis-py-test 5000
+sentinel failover-timeout redis-py-test 60000
+sentinel parallel-syncs redis-py-test 1
diff --git a/docker/sentinel_2/Dockerfile b/docker/sentinel_2/Dockerfile
index cd59777..dc3c332 100644
--- a/docker/sentinel_2/Dockerfile
+++ b/docker/sentinel_2/Dockerfile
@@ -1,7 +1,7 @@
 FROM redis-py-base:latest
 
-COPY redis.conf /etc/conf/redis/redis.conf
+COPY redis.conf /usr/local/etc/redis/redis.conf
 
 EXPOSE 26380
 
-CMD redis-server
+CMD [ "redis-sentinel", "/usr/local/etc/redis/redis.conf" ]
diff --git a/docker/sentinel_2/redis.conf b/docker/sentinel_2/redis.conf
index 9ab8934..264443c 100644
--- a/docker/sentinel_2/redis.conf
+++ b/docker/sentinel_2/redis.conf
@@ -1,7 +1,7 @@
-pidfile /var/run/sentinel-2.pid
+bind sentinel_2 127.0.0.1
 port 26380
-daemonize yes
-logfile /var/log/redis-sentinel-2
 
-# short timeout for sentinel tests
-sentinel down-after-milliseconds mymaster 500
+sentinel monitor redis-py-test master 6379 2
+sentinel down-after-milliseconds redis-py-test 5000
+sentinel failover-timeout redis-py-test 60000
+sentinel parallel-syncs redis-py-test 1
diff --git a/docker/sentinel_3/Dockerfile b/docker/sentinel_3/Dockerfile
index 2e81a15..f0d48c9 100644
--- a/docker/sentinel_3/Dockerfile
+++ b/docker/sentinel_3/Dockerfile
@@ -1,7 +1,7 @@
 FROM redis-py-base:latest
 
-COPY redis.conf /etc/conf/redis/redis.conf
+COPY redis.conf /usr/local/etc/redis/redis.conf
 
 EXPOSE 26381
 
-CMD redis-server
+CMD [ "redis-sentinel", "/usr/local/etc/redis/redis.conf" ]
diff --git a/docker/sentinel_3/redis.conf b/docker/sentinel_3/redis.conf
index b971b2f..b0827f1 100644
--- a/docker/sentinel_3/redis.conf
+++ b/docker/sentinel_3/redis.conf
@@ -1,7 +1,7 @@
-pidfile /var/run/sentinel-3.pid
+bind sentinel_3 127.0.0.1
 port 26381
-daemonize yes
-logfile /var/log/redis-sentinel-3
 
-# short timeout for sentinel tests
-sentinel down-after-milliseconds mymaster 500
+sentinel monitor redis-py-test master 6379 2
+sentinel down-after-milliseconds redis-py-test 5000
+sentinel failover-timeout redis-py-test 60000
+sentinel parallel-syncs redis-py-test 1
diff --git a/docker/slave/Dockerfile b/docker/slave/Dockerfile
index 74c1fb0..7b6bdbe 100644
--- a/docker/slave/Dockerfile
+++ b/docker/slave/Dockerfile
@@ -1,7 +1,7 @@
 FROM redis-py-base:latest
 
-COPY redis.conf /etc/conf/redis/redis.conf
+COPY redis.conf /usr/local/etc/redis/redis.conf
 
 EXPOSE 6380
 
-CMD redis-server
+CMD [ "redis-server", "/usr/local/etc/redis/redis.conf" ]
diff --git a/docker/slave/redis.conf b/docker/slave/redis.conf
index b51cb84..629ac70 100644
--- a/docker/slave/redis.conf
+++ b/docker/slave/redis.conf
@@ -1,11 +1,4 @@
-pidfile /var/run/redis-slave.pid
-bind *
+bind slave 127.0.0.1
 port 6380
-daemonize yes
-unixsocket /tmp/redis-slave.sock
-unixsocketperm 777
-dbfilename slave.rdb
-dir /var/lib/redis/backups
-logfile /var/log/redis-slave
-
-slaveof 127.0.0.1 6379
+save ""
+slaveof master 6379