Skip to content

Commit bfd7a55

Browse files
xdanielsbxdanielsb
committed
chore: bump patronx to 2.1.0
1 parent f1ad9b1 commit bfd7a55

3 files changed

Lines changed: 83 additions & 26 deletions

File tree

‎infra/compose/docker-compose.dev.yml‎

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ services:
1212
- ../../services/backend/db/init:/docker-entrypoint-initdb.d
1313
ports:
1414
- "5432:5432"
15+
healthcheck:
16+
test: ["CMD-SHELL", "pg_isready -U test_user -d test_db"]
17+
interval: 5s
18+
timeout: 5s
19+
retries: 5
1520

1621
elasticsearch:
1722
image: docker.elastic.co/elasticsearch/elasticsearch:8.13.4
@@ -51,33 +56,50 @@ services:
5156

5257
rabbitmq:
5358
image: rabbitmq:3.13-management
54-
restart: unless-stopped
59+
ports: [ "5672:5672", "15672:15672" ]
60+
healthcheck:
61+
test: [ "CMD-SHELL", "rabbitmq-diagnostics -q ping" ]
62+
interval: 10s
63+
timeout: 5s
64+
retries: 5
65+
66+
redis:
67+
image: redis:7-alpine
68+
healthcheck:
69+
test: [ "CMD-SHELL", "redis-cli ping || exit 1" ]
70+
interval: 5s
71+
timeout: 3s
72+
retries: 10
5573
ports:
56-
- "5672:5672"
57-
- "15672:15672"
74+
- "6379:6379"
5875

5976
patronx-worker:
60-
image: xdanielsb/patronx:2.0.0
61-
entrypoint: ["remoulade"]
62-
command: ["patronx.tasks"]
77+
image: xdanielsb/patronx:2.1.0
78+
entrypoint: ["patronx"]
79+
command: ["start"]
6380
restart: unless-stopped
6481
environment:
6582
AMQP_URL: amqp://guest:guest@rabbitmq:5672/
83+
REDIS_URL: redis://redis:6379/0
6684
PGHOST: db
6785
PGPORT: 5432
6886
PGDATABASE: ${POSTGRES_DB}
6987
PGUSER: ${POSTGRES_USER}
7088
PGPASSWORD: ${POSTGRES_PASSWORD}
71-
BACKUP_DIR: ./backups
89+
BACKUP_DIR: /app/backups
7290
S3_BUCKET: ${S3_BUCKET}
7391
AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
7492
AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
7593
AWS_DEFAULT_REGION: ${AWS_REGION}
7694
volumes:
77-
- ../../backups:./backups
95+
- ../../backups:/app/backups
7896
depends_on:
79-
- db
80-
- rabbitmq
97+
db:
98+
condition: service_healthy
99+
redis:
100+
condition: service_healthy
101+
rabbitmq:
102+
condition: service_healthy
81103

82104
analytics:
83105
build:

‎infra/compose/docker-compose.keycloak.yml‎

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,30 +30,48 @@ services:
3030

3131
rabbitmq:
3232
image: rabbitmq:3.13-management
33-
restart: unless-stopped
33+
healthcheck:
34+
test: [ "CMD-SHELL", "rabbitmq-diagnostics -q ping" ]
35+
interval: 10s
36+
timeout: 5s
37+
retries: 5
38+
39+
redis:
40+
image: redis:7-alpine
41+
healthcheck:
42+
test: [ "CMD-SHELL", "redis-cli ping || exit 1" ]
43+
interval: 5s
44+
timeout: 3s
45+
retries: 10
3446

3547
patronx-worker:
36-
image: xdanielsb/patronx:2.0.0
37-
entrypoint: ["remoulade"]
38-
command: ["patronx.tasks"]
48+
image: xdanielsb/patronx:2.1.0
49+
entrypoint: ["patronx"]
50+
command: ["start"]
3951
restart: unless-stopped
4052
environment:
4153
AMQP_URL: amqp://guest:guest@rabbitmq:5672/
54+
REDIS_URL: redis://redis:6379/0
4255
PGHOST: db
4356
PGPORT: 5432
4457
PGDATABASE: ${POSTGRES_DB}
4558
PGUSER: ${POSTGRES_USER}
4659
PGPASSWORD: ${POSTGRES_PASSWORD}
47-
BACKUP_DIR: /backups
60+
BACKUP_DIR: /app/backups
4861
S3_BUCKET: ${S3_BUCKET}
4962
AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
5063
AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
5164
AWS_DEFAULT_REGION: ${AWS_REGION}
5265
volumes:
53-
- ../../backups:./backups
66+
- ../../backups:/app/backups
5467
depends_on:
55-
- db
56-
- rabbitmq
68+
db:
69+
condition: service_healthy
70+
redis:
71+
condition: service_healthy
72+
rabbitmq:
73+
condition: service_healthy
74+
5775

5876
keycloak:
5977
image: quay.io/keycloak/keycloak:26.0.0

‎infra/compose/docker-compose.yml‎

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -131,30 +131,47 @@ services:
131131

132132
rabbitmq:
133133
image: rabbitmq:3.13-management
134-
restart: unless-stopped
134+
healthcheck:
135+
test: [ "CMD-SHELL", "rabbitmq-diagnostics -q ping" ]
136+
interval: 10s
137+
timeout: 5s
138+
retries: 5
139+
140+
redis:
141+
image: redis:7-alpine
142+
healthcheck:
143+
test: [ "CMD-SHELL", "redis-cli ping || exit 1" ]
144+
interval: 5s
145+
timeout: 3s
146+
retries: 10
135147

136148
patronx-worker:
137-
image: xdanielsb/patronx:2.0.0
138-
entrypoint: ["remoulade"]
139-
command: ["patronx.tasks"]
149+
image: xdanielsb/patronx:2.1.0
150+
entrypoint: ["patronx"]
151+
command: ["start"]
140152
restart: unless-stopped
141153
environment:
142154
AMQP_URL: amqp://guest:guest@rabbitmq:5672/
155+
REDIS_URL: redis://redis:6379/0
143156
PGHOST: db
144157
PGPORT: 5432
145158
PGDATABASE: ${POSTGRES_DB}
146159
PGUSER: ${POSTGRES_USER}
147160
PGPASSWORD: ${POSTGRES_PASSWORD}
148-
BACKUP_DIR: ./backups
161+
BACKUP_DIR: /app/backups
149162
S3_BUCKET: ${S3_BUCKET}
150163
AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
151164
AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
152165
AWS_DEFAULT_REGION: ${AWS_REGION}
153166
volumes:
154-
- ../../backups:./backups
167+
- ../../backups:/app/backups
155168
depends_on:
156-
- db
157-
- rabbitmq
169+
db:
170+
condition: service_healthy
171+
redis:
172+
condition: service_healthy
173+
rabbitmq:
174+
condition: service_healthy
158175

159176
prometheus:
160177
image: prom/prometheus:v2.54.0

0 commit comments

Comments
 (0)