Compare commits

...

2 Commits

Author SHA1 Message Date
9f7f993aa2 Merge branch 'master' of gitea:GoldenPogacsa/p2p-storage-simulator
All checks were successful
continuous-integration/drone/push Build is passing
2020-05-13 16:03:13 +02:00
cee40adb92 further changes 2020-05-13 16:03:05 +02:00

View File

@ -36,8 +36,10 @@ services:
restart: unless-stopped restart: unless-stopped
environment: environment:
- PRODUCER_KNOWNCONSUMER=192.168.111.21 - PRODUCER_KNOWNCONSUMER=192.168.111.21
- PRODUCER_REDIS=localhost - PRODUCER_REDIS=192.168.222.211
network_mode: "service:producer-redis1-1" networks:
firstsubnet:
ipv4_address: 192.168.111.11
depends_on: depends_on:
- consumer-api1 - consumer-api1
- producer-redis1-1 - producer-redis1-1
@ -46,8 +48,8 @@ services:
image: registry.kmlabz.com/goldenpogacsa/producer-endpoint image: registry.kmlabz.com/goldenpogacsa/producer-endpoint
restart: unless-stopped restart: unless-stopped
environment: environment:
- REDIS_URL=redis://localhost - REDIS_URL=redis://192.168.111.211/0
network_mode: "service:producer-redis1-1" network_mode: "service:producer1-1"
depends_on: depends_on:
- consumer-api1 - consumer-api1
- producer-redis1-1 - producer-redis1-1
@ -57,7 +59,7 @@ services:
restart: unless-stopped restart: unless-stopped
networks: networks:
firstsubnet: firstsubnet:
ipv4_address: 192.168.111.11 ipv4_address: 192.168.111.211
#### Producer 2 #### Producer 2
@ -68,7 +70,10 @@ services:
restart: unless-stopped restart: unless-stopped
environment: environment:
- PRODUCER_KNOWNCONSUMER=192.168.111.21 - PRODUCER_KNOWNCONSUMER=192.168.111.21
network_mode: "service:producer-redis1-2" - PRODUCER_REDIS=192.168.222.210
networks:
firstsubnet:
ipv4_address: 192.168.111.10
depends_on: depends_on:
- consumer-api1 - consumer-api1
- producer-redis1-2 - producer-redis1-2
@ -77,8 +82,8 @@ services:
image: registry.kmlabz.com/goldenpogacsa/producer-endpoint image: registry.kmlabz.com/goldenpogacsa/producer-endpoint
restart: unless-stopped restart: unless-stopped
environment: environment:
- REDIS_URL=redis://localhost - REDIS_URL=redis://192.168.111.210/0
network_mode: "service:producer-redis1-2" network_mode: "service:producer1-2"
depends_on: depends_on:
- consumer-api1 - consumer-api1
- producer-redis1-2 - producer-redis1-2
@ -89,7 +94,7 @@ services:
restart: unless-stopped restart: unless-stopped
networks: networks:
firstsubnet: firstsubnet:
ipv4_address: 192.168.111.10 ipv4_address: 192.168.111.210
#### Producer 3 #### Producer 3
@ -100,7 +105,10 @@ services:
restart: unless-stopped restart: unless-stopped
environment: environment:
- PRODUCER_KNOWNCONSUMER=192.168.111.21 - PRODUCER_KNOWNCONSUMER=192.168.111.21
network_mode: "service:producer-redis1-3" - PRODUCER_REDIS=192.168.222.209
networks:
firstsubnet:
ipv4_address: 192.168.111.9
depends_on: depends_on:
- consumer-api1 - consumer-api1
- producer-redis1-3 - producer-redis1-3
@ -109,8 +117,8 @@ services:
image: registry.kmlabz.com/goldenpogacsa/producer-endpoint image: registry.kmlabz.com/goldenpogacsa/producer-endpoint
restart: unless-stopped restart: unless-stopped
environment: environment:
- REDIS_URL=redis://localhost - REDIS_URL=redis://192.168.111.209/0
network_mode: "service:producer-redis1-3" network_mode: "service:producer1-3"
depends_on: depends_on:
- consumer-api1 - consumer-api1
- producer-redis1-3 - producer-redis1-3
@ -121,7 +129,7 @@ services:
restart: unless-stopped restart: unless-stopped
networks: networks:
firstsubnet: firstsubnet:
ipv4_address: 192.168.111.9 ipv4_address: 192.168.111.209
### Producer group 2 ### Producer group 2
@ -132,7 +140,10 @@ services:
restart: unless-stopped restart: unless-stopped
environment: environment:
- PRODUCER_KNOWNCONSUMER=192.168.222.22 - PRODUCER_KNOWNCONSUMER=192.168.222.22
network_mode: "service:producer-redis2-1" - PRODUCER_REDIS=192.168.222.212
networks:
secondsubnet:
ipv4_address: 192.168.222.12
depends_on: depends_on:
- consumer-api2 - consumer-api2
- producer-redis2-1 - producer-redis2-1
@ -141,8 +152,8 @@ services:
image: registry.kmlabz.com/goldenpogacsa/producer-endpoint image: registry.kmlabz.com/goldenpogacsa/producer-endpoint
restart: unless-stopped restart: unless-stopped
environment: environment:
- REDIS_URL=redis://localhost - REDIS_URL=redis://192.168.222.212/0
network_mode: "service:producer-redis2-1" network_mode: "service:producer2-1"
depends_on: depends_on:
- consumer-api2 - consumer-api2
- producer-redis2-1 - producer-redis2-1
@ -152,7 +163,7 @@ services:
restart: unless-stopped restart: unless-stopped
networks: networks:
secondsubnet: secondsubnet:
ipv4_address: 192.168.222.12 ipv4_address: 192.168.222.212
#### Producer 2 #### Producer 2
@ -163,7 +174,10 @@ services:
restart: unless-stopped restart: unless-stopped
environment: environment:
- PRODUCER_KNOWNCONSUMER=192.168.222.22 - PRODUCER_KNOWNCONSUMER=192.168.222.22
network_mode: "service:producer-redis2-2" - PRODUCER_REDIS=192.168.222.213
networks:
secondsubnet:
ipv4_address: 192.168.222.13
depends_on: depends_on:
- consumer-api2 - consumer-api2
- producer-redis2-2 - producer-redis2-2
@ -172,8 +186,8 @@ services:
image: registry.kmlabz.com/goldenpogacsa/producer-endpoint image: registry.kmlabz.com/goldenpogacsa/producer-endpoint
restart: unless-stopped restart: unless-stopped
environment: environment:
- REDIS_URL=redis://localhost - REDIS_URL=redis://192.168.222.213/0
network_mode: "service:producer-redis2-2" network_mode: "service:producer2-2"
depends_on: depends_on:
- consumer-api2 - consumer-api2
- producer-redis2-2 - producer-redis2-2
@ -183,7 +197,7 @@ services:
restart: unless-stopped restart: unless-stopped
networks: networks:
secondsubnet: secondsubnet:
ipv4_address: 192.168.222.13 ipv4_address: 192.168.222.213
#### Producer 3 #### Producer 3
@ -194,7 +208,10 @@ services:
restart: unless-stopped restart: unless-stopped
environment: environment:
- PRODUCER_KNOWNCONSUMER=192.168.222.22 - PRODUCER_KNOWNCONSUMER=192.168.222.22
network_mode: "service:producer-redis2-3" - PRODUCER_REDIS=192.168.222.214
networks:
secondsubnet:
ipv4_address: 192.168.222.14
depends_on: depends_on:
- consumer-api2 - consumer-api2
- producer-redis2-3 - producer-redis2-3
@ -203,8 +220,8 @@ services:
image: registry.kmlabz.com/goldenpogacsa/producer-endpoint image: registry.kmlabz.com/goldenpogacsa/producer-endpoint
restart: unless-stopped restart: unless-stopped
environment: environment:
- REDIS_URL=redis://localhost - REDIS_URL=redis://192.168.222.214/0
network_mode: "service:producer-redis2-3" network_mode: "service:producer2-3"
depends_on: depends_on:
- consumer-api2 - consumer-api2
- producer-redis2-3 - producer-redis2-3
@ -214,7 +231,7 @@ services:
restart: unless-stopped restart: unless-stopped
networks: networks:
secondsubnet: secondsubnet:
ipv4_address: 192.168.222.14 ipv4_address: 192.168.222.214
## Producer Group 3 ## Producer Group 3
@ -226,8 +243,10 @@ services:
restart: unless-stopped restart: unless-stopped
environment: environment:
- PRODUCER_KNOWNCONSUMER=192.168.123.21 - PRODUCER_KNOWNCONSUMER=192.168.123.21
- PRODUCER_REDIS=localhost - PRODUCER_REDIS=192.168.123.211
network_mode: "service:producer-redis1-1" networks:
thirdsubnet:
ipv4_address: 192.168.123.11
depends_on: depends_on:
- consumer-api3 - consumer-api3
- producer-redis1-1 - producer-redis1-1
@ -236,8 +255,8 @@ services:
image: registry.kmlabz.com/goldenpogacsa/producer-endpoint image: registry.kmlabz.com/goldenpogacsa/producer-endpoint
restart: unless-stopped restart: unless-stopped
environment: environment:
- REDIS_URL=redis://localhost - REDIS_URL=redis://192.168.123.211/0
network_mode: "service:producer-redis1-1" network_mode: "service:producer3-1"
depends_on: depends_on:
- consumer-api3 - consumer-api3
- producer-redis1-1 - producer-redis1-1
@ -247,7 +266,7 @@ services:
restart: unless-stopped restart: unless-stopped
networks: networks:
thirdsubnet: thirdsubnet:
ipv4_address: 192.168.123.11 ipv4_address: 192.168.123.211
#### Producer 2 #### Producer 2
@ -258,7 +277,10 @@ services:
restart: unless-stopped restart: unless-stopped
environment: environment:
- PRODUCER_KNOWNCONSUMER=192.168.123.21 - PRODUCER_KNOWNCONSUMER=192.168.123.21
network_mode: "service:producer-redis1-2" - PRODUCER_REDIS=192.168.123.210
networks:
thirdsubnet:
ipv4_address: 192.168.123.10
depends_on: depends_on:
- consumer-api3 - consumer-api3
- producer-redis1-2 - producer-redis1-2
@ -267,19 +289,18 @@ services:
image: registry.kmlabz.com/goldenpogacsa/producer-endpoint image: registry.kmlabz.com/goldenpogacsa/producer-endpoint
restart: unless-stopped restart: unless-stopped
environment: environment:
- REDIS_URL=redis://localhost - REDIS_URL=redis://192.168.123.210/0
network_mode: "service:producer-redis1-2" network_mode: "service:producer3-2"
depends_on: depends_on:
# - consumer-api1 - consumer-api3
- producer-redis1-2 - producer-redis1-2
producer-redis3-2: producer-redis3-2:
image: redis image: redis
restart: unless-stopped restart: unless-stopped
networks: networks:
thirdsubnet: thirdsubnet:
ipv4_address: 192.168.123.10 ipv4_address: 192.168.123.210
#### Producer 3 #### Producer 3
@ -288,19 +309,22 @@ services:
restart: unless-stopped restart: unless-stopped
environment: environment:
- PRODUCER_KNOWNCONSUMER=192.168.123.22 - PRODUCER_KNOWNCONSUMER=192.168.123.22
network_mode: "service:producer-redis2-3" - PRODUCER_REDIS=192.168.123.214
networks:
thirdsubnet:
ipv4_address: 192.168.123.14
depends_on: depends_on:
# - consumer-api2 - consumer-api3
- producer-redis2-3 - producer-redis2-3
producer-endpoint3-3: producer-endpoint3-3:
image: registry.kmlabz.com/goldenpogacsa/producer-endpoint image: registry.kmlabz.com/goldenpogacsa/producer-endpoint
restart: unless-stopped restart: unless-stopped
environment: environment:
- REDIS_URL=redis://localhost - REDIS_URL=redis://192.168.123.214/0
network_mode: "service:producer-redis2-3" network_mode: "service:producer3-3"
depends_on: depends_on:
# - consumer-api2 - consumer-api3
- producer-redis2-3 - producer-redis2-3
producer-redis3-3: producer-redis3-3:
@ -308,7 +332,7 @@ services:
restart: unless-stopped restart: unless-stopped
networks: networks:
thirdsubnet: thirdsubnet:
ipv4_address: 192.168.123.14 ipv4_address: 192.168.123.214
## Consumer stuff ## Consumer stuff