Skip to content

Commit 1acfd7b

Browse files
committed
refactor(docker): Update service configurations and fix environment variable mappings
1 parent 2389791 commit 1acfd7b

2 files changed

Lines changed: 19 additions & 11 deletions

File tree

docker-compose.override.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,19 @@ services:
7777
# Enables autoreload.
7878
APP_RELOAD: "True"
7979

80-
mailcatcher:
81-
image: schickling/mailcatcher
80+
maildev:
81+
image: maildev/maildev
82+
environment:
83+
- TZ=Asia/Vladivostok
84+
- MAILDEV_WEB_PORT=1080
85+
- MAILDEV_SMTP_PORT=1025
8286
ports:
83-
- "1080:1080"
87+
- "8888:1080"
8488
- "1025:1025"
89+
logging:
90+
driver: "json-file"
91+
options:
92+
max-size: "1m"
8593

8694
taskiq-worker:
8795
restart: "no"
@@ -93,18 +101,20 @@ services:
93101
command:
94102
- taskiq
95103
- worker
96-
- app.tkq:broker
97-
- --reload
104+
- app.core.tkq:broker
105+
# - --reload
98106

99107
redis:
100108
restart: "no"
101109
ports:
102110
- "6379:6379"
103111

104112
rmq:
113+
image: rabbitmq:4.1.4-management-alpine
105114
restart: "no"
106115
ports:
107116
- "5672:5672"
117+
- "15672:15672"
108118

109119
kafka:
110120
restart: "no"

docker-compose.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ services:
4343
condition: service_healthy
4444
environment:
4545
DB_HOST: ${DB_CONTAINER_HOST?Variable not set}
46-
REDIS_HOST: ${RABBITMQ_CONTAINER_HOST?Variable not set}
47-
RABBIT_HOST: ${REDIS_CONTAINER_HOST?Variable not set}
46+
REDIS_HOST: ${REDIS_CONTAINER_HOST?Variable not set}
47+
RABBIT_HOST: ${RABBITMQ_CONTAINER_HOST?Variable not set}
4848
KAFKA_BOOTSTRAP_SERVERS: '["${KAFKA_CONTAINER_HOST?Variable not set}:${KAFKA_CFG_HEALTHCHECK_PORT?Variable not set}"]'
4949

5050
taskiq-worker:
@@ -55,7 +55,7 @@ services:
5555
command:
5656
- taskiq
5757
- worker
58-
- app.tkq:broker
58+
- app.core.tkq:broker
5959

6060
db:
6161
image: postgres:17.6-bookworm
@@ -121,10 +121,8 @@ services:
121121
restart: always
122122
environment:
123123
REDIS_DATABASE: ${REDIS_DATABASE?Variable not set}
124-
REDIS_MASTER_HOST: ${REDIS_CONTAINER_HOST?Variable not set}
125124
REDIS_PASSWORD: ${REDIS_PASS?Variable not set}
126125
REDIS_MASTER_PASSWORD: ${REDIS_MASTER_PASSWORD?Variable not set}
127-
REDIS_USER: ${REDIS_USER?Variable not set}
128126
env_file:
129127
- .env
130128
volumes:
@@ -136,7 +134,7 @@ services:
136134
retries: 20
137135

138136
rmq:
139-
image: rabbitmq:4.1.3-alpine
137+
image: rabbitmq:4.1.4-alpine
140138
hostname: ${RABBITMQ_CONTAINER_HOST?Variable not set}
141139
restart: always
142140
environment:

0 commit comments

Comments
 (0)