Skip to content

Commit 7816ab3

Browse files
andrea-mucciandrea-mucci
committed
updated docker compose
1 parent 8442b6b commit 7816ab3

File tree

7 files changed

+145
-47
lines changed

7 files changed

+145
-47
lines changed

‎tutorials/stock-wallet/docker-compose.yml‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,26 @@ services:
1818
POSTGRES_PASSWORD: min0s
1919
zookeeper:
2020
restart: always
21-
image: digitalwonderland/zookeeper:latest
22-
volumes:
23-
- zookeeper:/var/lib/zookeeper
21+
image: confluentinc/cp-zookeeper:latest
22+
environment:
23+
ZOOKEEPER_CLIENT_PORT: 2181
24+
ZOOKEEPER_TICK_TIME: 2000
25+
ports:
26+
- 22181:2181
2427
kafka:
2528
restart: always
26-
image: wurstmeister/kafka:latest
27-
ports:
28-
- '9092'
29+
image: confluentinc/cp-kafka:latest
2930
depends_on:
30-
- zookeeper
31-
volumes:
32-
- kafka:/kafka/kafka-logs
31+
- zookeeper
32+
ports:
33+
- 29092:29092
3334
environment:
34-
KAFKA_LOG_DIRS: /kafka/kafka-logs
35-
KAFKA_DELETE_TOPIC_ENABLE: 'true'
35+
KAFKA_BROKER_ID: 1
3636
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
37-
KAFKA_ADVERTISED_HOST_NAME: kafka
37+
KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092,PLAINTEXT_HOST://localhost:29092
38+
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
39+
KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
40+
KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
3841
discovery:
3942
restart: always
4043
build: external/discovery

‎tutorials/stock-wallet/docker-compose.yml.copy‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
version: '3.9'
2+
volumes:
3+
postgres: {}
4+
zookeeper: {}
5+
kafka: {}
6+
redis: {}
7+
services:
8+
postgres:
9+
restart: always
10+
build: external/postgres
11+
command: postgres -c 'max_connections=200'
12+
ports:
13+
- 5432:5432
14+
volumes:
15+
- postgres:/var/lib/postgresql/data
16+
environment:
17+
POSTGRES_USER: minos
18+
POSTGRES_PASSWORD: min0s
19+
zookeeper:
20+
restart: always
21+
image: digitalwonderland/zookeeper:latest
22+
volumes:
23+
- zookeeper:/var/lib/zookeeper
24+
kafka:
25+
restart: always
26+
image: wurstmeister/kafka:latest
27+
ports:
28+
- '9092'
29+
depends_on:
30+
- zookeeper
31+
volumes:
32+
- kafka:/kafka/kafka-logs
33+
environment:
34+
KAFKA_LOG_DIRS: /kafka/kafka-logs
35+
KAFKA_DELETE_TOPIC_ENABLE: 'true'
36+
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
37+
KAFKA_ADVERTISED_HOST_NAME: kafka
38+
discovery:
39+
restart: always
40+
build: external/discovery
41+
ports:
42+
- '5567'
43+
depends_on:
44+
- redis
45+
environment:
46+
DISCOVERY_SERVICE_DB_HOST: redis
47+
redis:
48+
restart: always
49+
image: redis:latest
50+
volumes:
51+
- redis:/data
52+
apigateway:
53+
restart: always
54+
build: external/apigateway
55+
ports:
56+
- 5566:5566
57+
depends_on:
58+
- discovery
59+
environment:
60+
PYTHONPATH: /api_gateway
61+
DISCOVERY_SERVICE_HOST: discovery
62+
API_GATEWAY_DISCOVERY_HOST: discovery
63+
microservice-wallet:
64+
restart: always
65+
build:
66+
context: microservices/wallet
67+
target: production
68+
environment: &id001
69+
MINOS_BROKER_QUEUE_HOST: postgres
70+
MINOS_BROKER_HOST: kafka
71+
MINOS_REPOSITORY_HOST: postgres
72+
MINOS_SNAPSHOT_HOST: postgres
73+
MINOS_DISCOVERY_HOST: discovery
74+
depends_on: &id002
75+
- postgres
76+
- kafka
77+
- discovery
78+
microservice-stocks:
79+
restart: always
80+
build:
81+
context: microservices/stocks
82+
target: production
83+
environment: *id001
84+
depends_on: *id002
85+
microservice-crypto:
86+
restart: always
87+
build:
88+
context: microservices/crypto
89+
target: production
90+
environment: *id001
91+
depends_on: *id002
92+
x-microservice-environment: *id001
93+
x-microservice-depends-on: *id002

‎tutorials/stock-wallet/microservices/crypto/config.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ service:
44
injections:
55
lock_pool: minos.common.PostgreSqlLockPool
66
postgresql_pool: minos.common.PostgreSqlPool
7-
broker_publisher: minos.plugins.kafka.InMemoryQueuedKafkaBrokerPublisher
8-
broker_subscriber_builder: minos.plugins.kafka.InMemoryQueuedKafkaBrokerSubscriberBuilder
7+
broker_publisher: minos.plugins.kafka.PostgreSqlQueuedKafkaBrokerPublisher
8+
broker_subscriber_builder: minos.plugins.kafka.PostgreSqlQueuedKafkaBrokerSubscriberBuilder
99
broker_pool: minos.networks.BrokerClientPool
1010
transaction_repository: minos.aggregate.PostgreSqlTransactionRepository
1111
event_repository: minos.aggregate.PostgreSqlEventRepository
@@ -63,4 +63,4 @@ saga:
6363
discovery:
6464
client: minos.plugins.minos_discovery.MinosDiscoveryClient
6565
host: localhost
66-
port: 5567
66+
port: 5567

‎tutorials/stock-wallet/microservices/crypto/src/commands/services.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,12 @@ def call_remote(self, ticker, _from: float):
7474
@enroute.periodic.event("* * * * *")
7575
async def get_crypto_values(self, request: Request):
7676
tickers = await CryptoAggregate.get_all_tickers()
77+
logger.warning("Periodic call Crypto----------")
7778
now = pendulum.now()
7879
now_minus_one_month = now.subtract(months=1)
7980
if len(tickers) > 0:
8081
for ticker in tickers:
82+
logger.warning("Num tickers {}".format(len(tickers)))
8183
ticker_updated = pendulum.parse(ticker["updated"])
8284
results = self.call_remote(ticker["ticker"], now_minus_one_month.to_datetime_string())
8385
for result in results:

‎tutorials/stock-wallet/microservices/crypto/src/queries/services.py‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -34,32 +34,32 @@ async def get_crypto(self, request: Request) -> Response:
3434
"""
3535
raise ResponseException("Not implemented yet!")
3636

37-
@enroute.broker.event("CryptoCreated")
38-
async def crypto_created(self, request: Request) -> None:
39-
"""Handle the Crypto creation events.
37+
# @enroute.broker.event("CryptoCreated")
38+
# async def crypto_created(self, request: Request) -> None:
39+
# """Handle the Crypto creation events.
40+
#
41+
# :param request: A request instance containing the aggregate difference.
42+
# :return: This method does not return anything.
43+
# """
44+
# event: Event = await request.content()
45+
# print(event)
4046

41-
:param request: A request instance containing the aggregate difference.
42-
:return: This method does not return anything.
43-
"""
44-
event: Event = await request.content()
45-
print(event)
46-
47-
@enroute.broker.event("CryptoUpdated")
48-
async def crypto_updated(self, request: Request) -> None:
49-
"""Handle the Crypto update events.
50-
51-
:param request: A request instance containing the aggregate difference.
52-
:return: This method does not return anything.
53-
"""
54-
event: Event = await request.content()
55-
print(event)
56-
57-
@enroute.broker.event("CryptoDeleted")
58-
async def crypto_deleted(self, request: Request) -> None:
59-
"""Handle the Crypto deletion events.
47+
# @enroute.broker.event("CryptoUpdated")
48+
# async def crypto_updated(self, request: Request) -> None:
49+
# """Handle the Crypto update events.
50+
#
51+
# :param request: A request instance containing the aggregate difference.
52+
# :return: This method does not return anything.
53+
# """
54+
# event: Event = await request.content()
55+
# print(event)
6056

61-
:param request: A request instance containing the aggregate difference.
62-
:return: This method does not return anything.
63-
"""
64-
event: Event = await request.content()
65-
print(event)
57+
# @enroute.broker.event("CryptoDeleted")
58+
# async def crypto_deleted(self, request: Request) -> None:
59+
# """Handle the Crypto deletion events.
60+
#
61+
# :param request: A request instance containing the aggregate difference.
62+
# :return: This method does not return anything.
63+
# """
64+
# event: Event = await request.content()
65+
# print(event)

‎tutorials/stock-wallet/microservices/stocks/config.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ service:
44
injections:
55
lock_pool: minos.common.PostgreSqlLockPool
66
postgresql_pool: minos.common.PostgreSqlPool
7-
broker_publisher: minos.plugins.kafka.InMemoryQueuedKafkaBrokerPublisher
8-
broker_subscriber_builder: minos.plugins.kafka.InMemoryQueuedKafkaBrokerSubscriberBuilder
7+
broker_publisher: minos.plugins.kafka.PostgreSqlQueuedKafkaBrokerPublisher
8+
broker_subscriber_builder: minos.plugins.kafka.PostgreSqlQueuedKafkaBrokerSubscriberBuilder
99
broker_pool: minos.networks.BrokerClientPool
1010
transaction_repository: minos.aggregate.PostgreSqlTransactionRepository
1111
event_repository: minos.aggregate.PostgreSqlEventRepository
@@ -63,4 +63,4 @@ saga:
6363
discovery:
6464
client: minos.plugins.minos_discovery.MinosDiscoveryClient
6565
host: localhost
66-
port: 5567
66+
port: 5567

‎tutorials/stock-wallet/microservices/wallet/config.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ service:
44
injections:
55
lock_pool: minos.common.PostgreSqlLockPool
66
postgresql_pool: minos.common.PostgreSqlPool
7-
broker_publisher: minos.plugins.kafka.InMemoryQueuedKafkaBrokerPublisher
8-
broker_subscriber_builder: minos.plugins.kafka.InMemoryQueuedKafkaBrokerSubscriberBuilder
7+
broker_publisher: minos.plugins.kafka.PostgreSqlQueuedKafkaBrokerPublisher
8+
broker_subscriber_builder: minos.plugins.kafka.PostgreSqlQueuedKafkaBrokerSubscriberBuilder
99
broker_pool: minos.networks.BrokerClientPool
1010
transaction_repository: minos.aggregate.PostgreSqlTransactionRepository
1111
event_repository: minos.aggregate.PostgreSqlEventRepository

0 commit comments

Comments
 (0)