mirror of
https://github.com/outbackdingo/labca.git
synced 2026-01-27 18:19:33 +00:00
112 lines
2.6 KiB
Diff
112 lines
2.6 KiB
Diff
diff --git a/docker-compose.yml b/docker-compose.yml
|
|
index b0c235a91..b7e5656c5 100644
|
|
--- a/docker-compose.yml
|
|
+++ b/docker-compose.yml
|
|
@@ -25,8 +25,6 @@ services:
|
|
ipv4_address: 10.77.77.77
|
|
rednet:
|
|
ipv4_address: 10.88.88.88
|
|
- redisnet:
|
|
- ipv4_address: 10.33.33.33
|
|
# Use sd-test-srv as a backup to Docker's embedded DNS server
|
|
# (https://docs.docker.com/config/containers/container-networking/#dns-services).
|
|
# If there's a name Docker's DNS server doesn't know about, it will
|
|
@@ -40,7 +38,6 @@ services:
|
|
- 4003:4003 # OCSP
|
|
depends_on:
|
|
- bmysql
|
|
- - bredis_clusterer
|
|
entrypoint: test/entrypoint.sh
|
|
working_dir: &boulder_working_dir /boulder
|
|
|
|
@@ -61,78 +58,6 @@ services:
|
|
logging:
|
|
driver: none
|
|
|
|
- bredis_1:
|
|
- image: redis:latest
|
|
- volumes:
|
|
- - ./test/:/test/:cached
|
|
- command: redis-server /test/redis.config
|
|
- networks:
|
|
- redisnet:
|
|
- ipv4_address: 10.33.33.2
|
|
-
|
|
- bredis_2:
|
|
- image: redis:latest
|
|
- volumes:
|
|
- - ./test/:/test/:cached
|
|
- command: redis-server /test/redis.config
|
|
- networks:
|
|
- redisnet:
|
|
- ipv4_address: 10.33.33.3
|
|
-
|
|
- bredis_3:
|
|
- image: redis:latest
|
|
- volumes:
|
|
- - ./test/:/test/:cached
|
|
- command: redis-server /test/redis.config
|
|
- networks:
|
|
- redisnet:
|
|
- ipv4_address: 10.33.33.4
|
|
-
|
|
- bredis_4:
|
|
- image: redis:latest
|
|
- volumes:
|
|
- - ./test/:/test/:cached
|
|
- command: redis-server /test/redis.config
|
|
- networks:
|
|
- redisnet:
|
|
- ipv4_address: 10.33.33.5
|
|
-
|
|
- bredis_5:
|
|
- image: redis:latest
|
|
- volumes:
|
|
- - ./test/:/test/:cached
|
|
- command: redis-server /test/redis.config
|
|
- networks:
|
|
- redisnet:
|
|
- ipv4_address: 10.33.33.6
|
|
-
|
|
- bredis_6:
|
|
- image: redis:latest
|
|
- volumes:
|
|
- - ./test/:/test/:cached
|
|
- command: redis-server /test/redis.config
|
|
- networks:
|
|
- redisnet:
|
|
- ipv4_address: 10.33.33.7
|
|
-
|
|
- bredis_clusterer:
|
|
- image: redis:latest
|
|
- volumes:
|
|
- - ./test/:/test/:cached
|
|
- - ./cluster/:/cluster/:cached
|
|
- command: /test/wait-for-it.sh 10.33.33.2 4218 /test/redis-create.sh
|
|
- depends_on:
|
|
- - bredis_1
|
|
- - bredis_2
|
|
- - bredis_3
|
|
- - bredis_4
|
|
- - bredis_5
|
|
- - bredis_6
|
|
- networks:
|
|
- redisnet:
|
|
- ipv4_address: 10.33.33.10
|
|
- aliases:
|
|
- - boulder-redis-clusterer
|
|
|
|
netaccess:
|
|
image: *boulder_image
|
|
@@ -160,10 +85,3 @@ networks:
|
|
driver: default
|
|
config:
|
|
- subnet: 10.88.88.0/24
|
|
-
|
|
- redisnet:
|
|
- driver: bridge
|
|
- ipam:
|
|
- driver: default
|
|
- config:
|
|
- - subnet: 10.33.33.0/24
|