Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleanup redis docker image name #920

Merged
merged 4 commits into from Nov 18, 2022
Merged

Cleanup redis docker image name #920

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5c6e5fc
Cleanup redis docker image name
rukai Nov 17, 2022
e71e9ec
Merge branch 'main' into cleanup_redis_image_name
rukai Nov 18, 2022
83e15eb
Merge branch 'main' into cleanup_redis_image_name
rukai Nov 18, 2022
08de1a2
Merge branch 'main' into cleanup_redis_image_name
rukai Nov 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/src/examples/redis-clustering-aware.md
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@ Below we can see an example of a Redis node and it's Shotover sidecar. Notice th
```YAML

redis-node-0:
image: docker.io/bitnami/redis-cluster:6.0-debian-10
image: bitnami/redis-cluster:6.0-debian-10
networks:
cluster_subnet:
ipv4_address: 172.16.1.2
Expand Down
14 changes: 7 additions & 7 deletions shotover-proxy/example-configs-docker/redis-cluster-ports-rewrite/docker-compose.yaml
View file
Open in desktop
@@ -1,7 +1,7 @@
version: '3.3'
services:
redis-node-0:
image: docker.io/bitnami/redis-cluster:6.0-debian-10
image: bitnami/redis-cluster:6.0-debian-10
networks:
cluster_subnet:
ipv4_address: 172.16.1.2
Expand All @@ -10,7 +10,7 @@ services:
- 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'

redis-node-1:
image: docker.io/bitnami/redis-cluster:6.0-debian-10
image: bitnami/redis-cluster:6.0-debian-10
networks:
cluster_subnet:
ipv4_address: 172.16.1.3
Expand All @@ -19,7 +19,7 @@ services:
- 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'

redis-node-2:
image: docker.io/bitnami/redis-cluster:6.0-debian-10
image: bitnami/redis-cluster:6.0-debian-10
networks:
cluster_subnet:
ipv4_address: 172.16.1.4
Expand All @@ -28,7 +28,7 @@ services:
- 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'

redis-node-3:
image: docker.io/bitnami/redis-cluster:6.0-debian-10
image: bitnami/redis-cluster:6.0-debian-10
networks:
cluster_subnet:
ipv4_address: 172.16.1.5
Expand All @@ -37,7 +37,7 @@ services:
- 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'

redis-node-4:
image: docker.io/bitnami/redis-cluster:6.0-debian-10
image: bitnami/redis-cluster:6.0-debian-10
networks:
cluster_subnet:
ipv4_address: 172.16.1.6
Expand All @@ -46,7 +46,7 @@ services:
- 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'

redis-node-5:
image: docker.io/bitnami/redis-cluster:6.0-debian-10
image: bitnami/redis-cluster:6.0-debian-10
networks:
cluster_subnet:
ipv4_address: 172.16.1.7
Expand All @@ -55,7 +55,7 @@ services:
- 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'

redis-cluster-init:
image: docker.io/bitnami/redis-cluster:6.0-debian-10
image: bitnami/redis-cluster:6.0-debian-10
networks:
cluster_subnet:
ipv4_address: 172.16.1.8
Expand Down
14 changes: 7 additions & 7 deletions shotover-proxy/example-configs-docker/redis-cluster/docker-compose.yaml
View file
Open in desktop
@@ -1,55 +1,55 @@
version: '3.3'
services:
redis-node-0:
image: docker.io/bitnami/redis-cluster:6.0-debian-10
image: bitnami/redis-cluster:6.0-debian-10
ports:
- "2220:6379"
environment:
- 'ALLOW_EMPTY_PASSWORD=yes'
- 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'

redis-node-1:
image: docker.io/bitnami/redis-cluster:6.0-debian-10
image: bitnami/redis-cluster:6.0-debian-10
ports:
- "2221:6379"
environment:
- 'ALLOW_EMPTY_PASSWORD=yes'
- 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'

redis-node-2:
image: docker.io/bitnami/redis-cluster:6.0-debian-10
image: bitnami/redis-cluster:6.0-debian-10
ports:
- "2222:6379"
environment:
- 'ALLOW_EMPTY_PASSWORD=yes'
- 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'

redis-node-3:
image: docker.io/bitnami/redis-cluster:6.0-debian-10
image: bitnami/redis-cluster:6.0-debian-10
ports:
- "2223:6379"
environment:
- 'ALLOW_EMPTY_PASSWORD=yes'
- 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'

redis-node-4:
image: docker.io/bitnami/redis-cluster:6.0-debian-10
image: bitnami/redis-cluster:6.0-debian-10
ports:
- "2224:6379"
environment:
- 'ALLOW_EMPTY_PASSWORD=yes'
- 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'

redis-node-5:
image: docker.io/bitnami/redis-cluster:6.0-debian-10
image: bitnami/redis-cluster:6.0-debian-10
ports:
- "2225:6379"
environment:
- 'ALLOW_EMPTY_PASSWORD=yes'
- 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'

redis-cluster-init:
image: docker.io/bitnami/redis-cluster:6.0-debian-10
image: bitnami/redis-cluster:6.0-debian-10
depends_on:
- redis-node-0
- redis-node-1
Expand Down
2 changes: 1 addition & 1 deletion shotover-proxy/example-configs/redis-cluster-dr/docker-compose.yaml
View file
Open in desktop
@@ -1,7 +1,7 @@
version: '3.3'
services:
redis-node-0:
image: &image docker.io/bitnami/redis-cluster:6.0-debian-10
image: &image bitnami/redis-cluster:6.0-debian-10
ports:
- "2220:6379"
environment:
Expand Down
4 changes: 2 additions & 2 deletions shotover-proxy/example-configs/redis-cluster-handling/docker-compose.yaml
View file
Open in desktop
@@ -1,7 +1,7 @@
version: '3.3'
services:
redis-node-0:
image: &image docker.io/bitnami/redis-cluster:6.0-debian-10
image: &image bitnami/redis-cluster:6.0-debian-10
ports:
- "2220:6379"
environment:
Expand Down Expand Up @@ -40,7 +40,7 @@ services:
environment: *environment

redis-cluster-init:
image: docker.io/bitnami/redis-cluster:6.0-debian-10
image: bitnami/redis-cluster:6.0-debian-10
depends_on:
- redis-node-0
- redis-node-1
Expand Down
4 changes: 2 additions & 2 deletions shotover-proxy/example-configs/redis-cluster-hiding/docker-compose.yaml
View file
Open in desktop
@@ -1,7 +1,7 @@
version: '3.3'
services:
redis-node-0:
image: &image docker.io/bitnami/redis-cluster:6.0-debian-10
image: &image bitnami/redis-cluster:6.0-debian-10
ports:
- "2220:6379"
environment:
Expand Down Expand Up @@ -40,7 +40,7 @@ services:
environment: *environment

redis-cluster-init:
image: docker.io/bitnami/redis-cluster:6.0-debian-10
image: bitnami/redis-cluster:6.0-debian-10
depends_on:
- redis-node-0
- redis-node-1
Expand Down
2 changes: 1 addition & 1 deletion shotover-proxy/example-configs/redis-cluster-tls/docker-compose-with-key.yaml
View file
Open in desktop
@@ -1,7 +1,7 @@
version: '3.3'
services:
redis-node-0:
image: &image docker.io/bitnami/redis-cluster:6.0-debian-10
image: &image bitnami/redis-cluster:6.0-debian-10
ports:
- "2220:6379"
volumes:
Expand Down
2 changes: 1 addition & 1 deletion shotover-proxy/example-configs/redis-cluster-tls/docker-compose.yaml
View file
Open in desktop
@@ -1,7 +1,7 @@
version: '3.3'
services:
redis-node-0:
image: &image docker.io/bitnami/redis-cluster:6.0-debian-10
image: &image bitnami/redis-cluster:6.0-debian-10
ports:
- "2220:6379"
volumes:
Expand Down
5 changes: 3 additions & 2 deletions shotover-proxy/tests/test-configs/redis-cluster-auth/docker-compose.yaml
View file
Open in desktop
@@ -1,10 +1,11 @@
version: '3.3'
services:
redis-node-0:
image: &image docker.io/bitnami/redis-cluster:6.0-debian-10
image: &image bitnami/redis-cluster:6.0-debian-10
ports:
- "2230:6379"
environment: &environment
environment:
&environment
- 'REDIS_PASSWORD=shotover'
- 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'

Expand Down
4 changes: 2 additions & 2 deletions shotover-proxy/tests/test-configs/redis-cluster-ports-rewrite/docker-compose.yaml
View file
Open in desktop
@@ -1,7 +1,7 @@
version: '3.3'
services:
redis-node-0:
image: &image docker.io/bitnami/redis-cluster:6.0-debian-10
image: &image bitnami/redis-cluster:6.0-debian-10
ports:
- "2220:6379"
environment:
Expand Down Expand Up @@ -40,7 +40,7 @@ services:
environment: *environment

redis-cluster-init:
image: docker.io/bitnami/redis-cluster:6.0-debian-10
image: bitnami/redis-cluster:6.0-debian-10
depends_on:
- redis-node-0
- redis-node-1
Expand Down