mirror of
https://github.com/outbackdingo/labca.git
synced 2026-01-27 10:19:34 +00:00
82 lines
1.8 KiB
Diff
82 lines
1.8 KiB
Diff
diff --git a/docker-compose.yml b/docker-compose.yml
|
|
index 928c11bec..0d59c1228 100644
|
|
--- a/docker-compose.yml
|
|
+++ b/docker-compose.yml
|
|
@@ -30,8 +30,6 @@ services:
|
|
ipv4_address: 10.77.77.77
|
|
integrationtestnet:
|
|
ipv4_address: 10.88.88.88
|
|
- redisnet:
|
|
- ipv4_address: 10.33.33.33
|
|
consulnet:
|
|
ipv4_address: 10.55.55.55
|
|
# Use consul as a backup to Docker's embedded DNS server. If there's a name
|
|
@@ -50,10 +48,6 @@ services:
|
|
depends_on:
|
|
- bmysql
|
|
- bproxysql
|
|
- - bredis_1
|
|
- - bredis_2
|
|
- - bredis_3
|
|
- - bredis_4
|
|
- bconsul
|
|
- bjaeger
|
|
entrypoint: test/entrypoint.sh
|
|
@@ -91,42 +85,6 @@ services:
|
|
aliases:
|
|
- boulder-proxysql
|
|
|
|
- bredis_1:
|
|
- image: redis:6.2.7
|
|
- volumes:
|
|
- - ./test/:/test/:cached
|
|
- command: redis-server /test/redis-ocsp.config
|
|
- networks:
|
|
- redisnet:
|
|
- ipv4_address: 10.33.33.2
|
|
-
|
|
- bredis_2:
|
|
- image: redis:6.2.7
|
|
- volumes:
|
|
- - ./test/:/test/:cached
|
|
- command: redis-server /test/redis-ocsp.config
|
|
- networks:
|
|
- redisnet:
|
|
- ipv4_address: 10.33.33.3
|
|
-
|
|
- bredis_3:
|
|
- image: redis:6.2.7
|
|
- volumes:
|
|
- - ./test/:/test/:cached
|
|
- command: redis-server /test/redis-ratelimits.config
|
|
- networks:
|
|
- redisnet:
|
|
- ipv4_address: 10.33.33.4
|
|
-
|
|
- bredis_4:
|
|
- image: redis:6.2.7
|
|
- volumes:
|
|
- - ./test/:/test/:cached
|
|
- command: redis-server /test/redis-ratelimits.config
|
|
- networks:
|
|
- redisnet:
|
|
- ipv4_address: 10.33.33.5
|
|
-
|
|
bconsul:
|
|
image: hashicorp/consul:1.15.4
|
|
volumes:
|
|
@@ -171,13 +129,6 @@ networks:
|
|
config:
|
|
- subnet: 10.88.88.0/24
|
|
|
|
- redisnet:
|
|
- driver: bridge
|
|
- ipam:
|
|
- driver: default
|
|
- config:
|
|
- - subnet: 10.33.33.0/24
|
|
-
|
|
consulnet:
|
|
driver: bridge
|
|
ipam:
|