redisjson support (#1636)

13 files changed, 10 insertions, 44 deletions

diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
index 60e4141..60be374 100644
--- a/docker/base/Dockerfile
+++ b/docker/base/Dockerfile
@@ -1 +1,3 @@
-FROM redis:6.2.5-buster
\ No newline at end of file
+FROM redis:6.2.6-buster
+
+CMD ["redis-server", "/redis.conf"]
diff --git a/docker/base/Dockerfile.sentinel b/docker/base/Dockerfile.sentinel
new file mode 100644
index 0000000..93c16a7
--- /dev/null
+++ b/docker/base/Dockerfile.sentinel
@@ -0,0 +1,3 @@
+FROM redis:6.2.6-buster
+
+CMD ["redis-sentinel", "/sentinel.conf"]
diff --git a/docker/base/README.md b/docker/base/README.md
new file mode 100644
index 0000000..a2f26a8
--- /dev/null
+++ b/docker/base/README.md
@@ -0,0 +1 @@
+Dockers in this folder are built, and uploaded to the redisfab dockerhub store.
diff --git a/docker/master/Dockerfile b/docker/master/Dockerfile
deleted file mode 100644
index 1f4bd73..0000000
--- a/docker/master/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM redis-py-base:latest
-
-COPY redis.conf /usr/local/etc/redis/redis.conf
-
-EXPOSE 6379
-
-CMD [ "redis-server", "/usr/local/etc/redis/redis.conf" ]
diff --git a/docker/master/redis.conf b/docker/master/redis.conf
index ed00766..15a31b5 100644
--- a/docker/master/redis.conf
+++ b/docker/master/redis.conf
@@ -1,3 +1,2 @@
-bind master 127.0.0.1
 port 6379
 save ""
diff --git a/docker/replica/Dockerfile b/docker/replica/Dockerfile
deleted file mode 100644
index 7b6bdbe..0000000
--- a/docker/replica/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM redis-py-base:latest
-
-COPY redis.conf /usr/local/etc/redis/redis.conf
-
-EXPOSE 6380
-
-CMD [ "redis-server", "/usr/local/etc/redis/redis.conf" ]
diff --git a/docker/replica/redis.conf b/docker/replica/redis.conf
index 4a1dcd7..a76d402 100644
--- a/docker/replica/redis.conf
+++ b/docker/replica/redis.conf
@@ -1,4 +1,3 @@
-bind replica 127.0.0.1
 port 6380
 save ""
 replicaof master 6379
diff --git a/docker/sentinel_1/Dockerfile b/docker/sentinel_1/Dockerfile
deleted file mode 100644
index 66f6a75..0000000
--- a/docker/sentinel_1/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM redis-py-base:latest
-
-COPY sentinel.conf /usr/local/etc/redis/sentinel.conf
-
-EXPOSE 26379
-
-CMD [ "redis-sentinel", "/usr/local/etc/redis/sentinel.conf" ]
diff --git a/docker/sentinel_1/sentinel.conf b/docker/sentinel_1/sentinel.conf
index fc9aa68..bd2d830 100644
--- a/docker/sentinel_1/sentinel.conf
+++ b/docker/sentinel_1/sentinel.conf
@@ -1,7 +1,6 @@
-bind sentinel_1 127.0.0.1
 port 26379
 
-sentinel monitor redis-py-test master 6379 2
+sentinel monitor redis-py-test 127.0.0.1 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
deleted file mode 100644
index 1c0bb92..0000000
--- a/docker/sentinel_2/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM redis-py-base:latest
-
-COPY sentinel.conf /usr/local/etc/redis/sentinel.conf
-
-EXPOSE 26380
-
-CMD [ "redis-sentinel", "/usr/local/etc/redis/sentinel.conf" ]
diff --git a/docker/sentinel_2/sentinel.conf b/docker/sentinel_2/sentinel.conf
index 264443c..955621b 100644
--- a/docker/sentinel_2/sentinel.conf
+++ b/docker/sentinel_2/sentinel.conf
@@ -1,7 +1,6 @@
-bind sentinel_2 127.0.0.1
 port 26380
 
-sentinel monitor redis-py-test master 6379 2
+sentinel monitor redis-py-test 127.0.0.1 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
deleted file mode 100644
index cf1ec21..0000000
--- a/docker/sentinel_3/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM redis-py-base:latest
-
-COPY sentinel.conf /usr/local/etc/redis/sentinel.conf
-
-EXPOSE 26381
-
-CMD [ "redis-sentinel", "/usr/local/etc/redis/sentinel.conf" ]
diff --git a/docker/sentinel_3/sentinel.conf b/docker/sentinel_3/sentinel.conf
index b0827f1..62c4051 100644
--- a/docker/sentinel_3/sentinel.conf
+++ b/docker/sentinel_3/sentinel.conf
@@ -1,7 +1,6 @@
-bind sentinel_3 127.0.0.1
 port 26381
 
-sentinel monitor redis-py-test master 6379 2
+sentinel monitor redis-py-test 127.0.0.1 6379 2
 sentinel down-after-milliseconds redis-py-test 5000
 sentinel failover-timeout redis-py-test 60000
 sentinel parallel-syncs redis-py-test 1