Skip to content

Commit 57592f9

Browse files
committed
change ports to resolve conflict with unstable_cluster
1 parent 4d2d62c commit 57592f9

File tree

10 files changed

+16
-16
lines changed

10 files changed

+16
-16
lines changed

docker/redis4/master/redis.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
port 6376
1+
port 6381
22
save ""
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
port 26385
22

3-
sentinel monitor redis-py-test 127.0.0.1 6376 2
3+
sentinel monitor redis-py-test 127.0.0.1 6381 2
44
sentinel down-after-milliseconds redis-py-test 5000
55
sentinel failover-timeout redis-py-test 60000
66
sentinel parallel-syncs redis-py-test 1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
port 26386
22

3-
sentinel monitor redis-py-test 127.0.0.1 6376 2
3+
sentinel monitor redis-py-test 127.0.0.1 6381 2
44
sentinel down-after-milliseconds redis-py-test 5000
55
sentinel failover-timeout redis-py-test 60000
66
sentinel parallel-syncs redis-py-test 1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
port 26387
22

3-
sentinel monitor redis-py-test 127.0.0.1 6376 2
3+
sentinel monitor redis-py-test 127.0.0.1 6381 2
44
sentinel down-after-milliseconds redis-py-test 5000
55
sentinel failover-timeout redis-py-test 60000
66
sentinel parallel-syncs redis-py-test 1

docker/redis5/master/redis.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
port 6377
1+
port 6382
22
save ""

docker/redis5/replica/redis.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
port 6375
1+
port 6383
22
save ""
3-
replicaof master 6377
3+
replicaof master 6382
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
port 26382
22

3-
sentinel monitor redis-py-test 127.0.0.1 6377 2
3+
sentinel monitor redis-py-test 127.0.0.1 6382 2
44
sentinel down-after-milliseconds redis-py-test 5000
55
sentinel failover-timeout redis-py-test 60000
66
sentinel parallel-syncs redis-py-test 1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
port 26383
22

3-
sentinel monitor redis-py-test 127.0.0.1 6377 2
3+
sentinel monitor redis-py-test 127.0.0.1 6382 2
44
sentinel down-after-milliseconds redis-py-test 5000
55
sentinel failover-timeout redis-py-test 60000
66
sentinel parallel-syncs redis-py-test 1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
port 26384
22

3-
sentinel monitor redis-py-test 127.0.0.1 6377 2
3+
sentinel monitor redis-py-test 127.0.0.1 6383 2
44
sentinel down-after-milliseconds redis-py-test 5000
55
sentinel failover-timeout redis-py-test 60000
66
sentinel parallel-syncs redis-py-test 1

tox.ini

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ volumes =
125125
name = redis5_master
126126
image = redisfab/redis-py:5.0-buster
127127
ports =
128-
6377:6377/tcp
129-
healtcheck_cmd = python -c "import socket;print(True) if 0 == socket.socket(socket.AF_INET, socket.SOCK_STREAM).connect_ex(('127.0.0.1',6377)) else False"
128+
6382:6382/tcp
129+
healtcheck_cmd = python -c "import socket;print(True) if 0 == socket.socket(socket.AF_INET, socket.SOCK_STREAM).connect_ex(('127.0.0.1',6382)) else False"
130130
volumes =
131131
bind:rw:{toxinidir}/docker/redis5/master/redis.conf:/redis.conf
132132

@@ -136,8 +136,8 @@ image = redisfab/redis-py:5.0-buster
136136
links =
137137
redis5_master:redis5_master
138138
ports =
139-
6375:6375/tcp
140-
healtcheck_cmd = python -c "import socket;print(True) if 0 == socket.socket(socket.AF_INET, socket.SOCK_STREAM).connect_ex(('127.0.0.1',6375)) else False"
139+
6383:6383/tcp
140+
healtcheck_cmd = python -c "import socket;print(True) if 0 == socket.socket(socket.AF_INET, socket.SOCK_STREAM).connect_ex(('127.0.0.1',6383)) else False"
141141
volumes =
142142
bind:rw:{toxinidir}/docker/redis5/replica/redis.conf:/redis.conf
143143

@@ -192,8 +192,8 @@ volumes =
192192
name = redis4_master
193193
image = redisfab/redis-py:4.0-buster
194194
ports =
195-
6376:6376/tcp
196-
healtcheck_cmd = python -c "import socket;print(True) if 0 == socket.socket(socket.AF_INET, socket.SOCK_STREAM).connect_ex(('127.0.0.1',6376)) else False"
195+
6381:6381/tcp
196+
healtcheck_cmd = python -c "import socket;print(True) if 0 == socket.socket(socket.AF_INET, socket.SOCK_STREAM).connect_ex(('127.0.0.1',6381)) else False"
197197
volumes =
198198
bind:rw:{toxinidir}/docker/redis4/master/redis.conf:/redis.conf
199199

0 commit comments

Comments
 (0)