Use one container per process

12 files changed, 94 insertions, 22 deletions

diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 898f5bf..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM ubuntu:20.04
-
-COPY build_tools /build_tools
-
-RUN /build_tools/bootstrap.sh
-RUN /build_tools/build_redis.sh
-RUN /build_tools/install_redis.sh
-RUN /build_tools/install_sentinel.sh
-
-COPY build_tools/start.sh /var/lib/redis/start.sh
-
-EXPOSE 6379
-EXPOSE 6380
-EXPOSE 26379
-EXPOSE 26380
-EXPOSE 26381
-
-CMD /var/lib/redis/start.sh
diff --git a/docker-compose.yml b/docker-compose.yml
index 9c61dd4..f335f3c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,13 +1,27 @@
 version: "3.8"
 
 services:
-  redis-py:
-    build: ./
+  master:
+    build: docker/master
     ports:
       - "6379:6379"
+
+  slave:
+    build: docker/slave
+    ports:
       - "6380:6380"
+
+  sentinel_1:
+    build: docker/sentinel_1
+    ports:
       - "26379:26379"
+
+  sentinel_2:
+    build: docker/sentinel_2
+    ports:
       - "26380:26380"
+
+  sentinel_3:
+    build: docker/sentinel_3
+    ports:
       - "26381:26381"
-    volumes:
-       - .:/mnt/redis-py
diff --git a/docker/master/Dockerfile b/docker/master/Dockerfile
new file mode 100644
index 0000000..c51249d
--- /dev/null
+++ b/docker/master/Dockerfile
@@ -0,0 +1,7 @@
+FROM redis:6.0.5-buster
+
+COPY redis.conf /etc/conf/redis/redis.conf
+
+EXPOSE 6379
+
+CMD redis-server
diff --git a/docker/master/redis.conf b/docker/master/redis.conf
new file mode 100644
index 0000000..cd1c984
--- /dev/null
+++ b/docker/master/redis.conf
@@ -0,0 +1,9 @@
+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
diff --git a/docker/sentinel_1/Dockerfile b/docker/sentinel_1/Dockerfile
new file mode 100644
index 0000000..016d873
--- /dev/null
+++ b/docker/sentinel_1/Dockerfile
@@ -0,0 +1,7 @@
+FROM redis:6.0.5-buster
+
+COPY redis.conf /etc/conf/redis/redis.conf
+
+EXPOSE 26379
+
+CMD redis-server
diff --git a/docker/sentinel_1/redis.conf b/docker/sentinel_1/redis.conf
new file mode 100644
index 0000000..d12979f
--- /dev/null
+++ b/docker/sentinel_1/redis.conf
@@ -0,0 +1,7 @@
+pidfile /var/run/sentinel-1.pid
+port 26379
+daemonize yes
+logfile /var/log/redis-sentinel-1
+
+# short timeout for sentinel tests
+sentinel down-after-milliseconds mymaster 500
diff --git a/docker/sentinel_2/Dockerfile b/docker/sentinel_2/Dockerfile
new file mode 100644
index 0000000..1a379be
--- /dev/null
+++ b/docker/sentinel_2/Dockerfile
@@ -0,0 +1,7 @@
+FROM redis:6.0.5-buster
+
+COPY redis.conf /etc/conf/redis/redis.conf
+
+EXPOSE 26380
+
+CMD redis-server
diff --git a/docker/sentinel_2/redis.conf b/docker/sentinel_2/redis.conf
new file mode 100644
index 0000000..9ab8934
--- /dev/null
+++ b/docker/sentinel_2/redis.conf
@@ -0,0 +1,7 @@
+pidfile /var/run/sentinel-2.pid
+port 26380
+daemonize yes
+logfile /var/log/redis-sentinel-2
+
+# short timeout for sentinel tests
+sentinel down-after-milliseconds mymaster 500
diff --git a/docker/sentinel_3/Dockerfile b/docker/sentinel_3/Dockerfile
new file mode 100644
index 0000000..e1e92d8
--- /dev/null
+++ b/docker/sentinel_3/Dockerfile
@@ -0,0 +1,7 @@
+FROM redis:6.0.5-buster
+
+COPY redis.conf /etc/conf/redis/redis.conf
+
+EXPOSE 26381
+
+CMD redis-server
diff --git a/docker/sentinel_3/redis.conf b/docker/sentinel_3/redis.conf
new file mode 100644
index 0000000..b971b2f
--- /dev/null
+++ b/docker/sentinel_3/redis.conf
@@ -0,0 +1,7 @@
+pidfile /var/run/sentinel-3.pid
+port 26381
+daemonize yes
+logfile /var/log/redis-sentinel-3
+
+# short timeout for sentinel tests
+sentinel down-after-milliseconds mymaster 500
diff --git a/docker/slave/Dockerfile b/docker/slave/Dockerfile
new file mode 100644
index 0000000..f9bd1ad
--- /dev/null
+++ b/docker/slave/Dockerfile
@@ -0,0 +1,7 @@
+FROM redis:6.0.5-buster
+
+COPY redis.conf /etc/conf/redis/redis.conf
+
+EXPOSE 6380
+
+CMD redis-server
diff --git a/docker/slave/redis.conf b/docker/slave/redis.conf
new file mode 100644
index 0000000..b51cb84
--- /dev/null
+++ b/docker/slave/redis.conf
@@ -0,0 +1,11 @@
+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