summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy McCurdy <andy@andymccurdy.com>2020-07-15 14:10:30 -0700
committerAndy McCurdy <andy@andymccurdy.com>2020-07-15 14:10:30 -0700
commit462fd34a7844a49556f8db5c0af23d81a353c9ed (patch)
treefef71c686eaf8eb1037ad87555c9ba25a7fad166
parent0fe33ba87d3d2a2dc84750489fccc193ac79d298 (diff)
downloadredis-py-462fd34a7844a49556f8db5c0af23d81a353c9ed.tar.gz
master/slave configs for docker
-rw-r--r--docker/master/Dockerfile4
-rw-r--r--docker/master/redis.conf8
-rw-r--r--docker/slave/Dockerfile4
-rw-r--r--docker/slave/redis.conf11
4 files changed, 7 insertions, 20 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..271bfaa 100644
--- a/docker/master/redis.conf
+++ b/docker/master/redis.conf
@@ -1,9 +1,3 @@
-pidfile /var/run/redis-master.pid
bind *
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/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..e2d8aba 100644
--- a/docker/slave/redis.conf
+++ b/docker/slave/redis.conf
@@ -1,11 +1,4 @@
-pidfile /var/run/redis-slave.pid
bind *
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