Skip to content

Commit babf9ab

Browse files
committed
refactor: remove RabbitMQ service and related environment variables from docker-compose
1 parent 635ee4b commit babf9ab

1 file changed

Lines changed: 0 additions & 52 deletions

File tree

docker-compose.projects.yml

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,6 @@ services:
168168
depends_on:
169169
database:
170170
condition: service_healthy
171-
rmq:
172-
condition: service_healthy
173171
publisher:
174172
condition: service_started
175173
build:
@@ -222,19 +220,8 @@ services:
222220
- MYSQL_BE_PASSWORD=${MYSQL_PASSWORD:?err}
223221
- MYSQL_BE_DATABASE=${MYSQL_DATABASE:?err}
224222

225-
- RMQ_HOST=${RMQ_HOST:-rmq}
226-
- RMQ_SSL=false
227-
228-
- RABBITMQ_DEFAULT_USER=${RABBITMQ_DEFAULT_USER:-guest}
229-
- RABBITMQ_DEFAULT_PASS=${RABBITMQ_DEFAULT_PASS:-guest}
230-
231223
- PUBLISHER_ENCRYPTION_KEY=${PUBLISHER_ENCRYPTION_KEY:?err}
232224

233-
- RMQ_ROUTING_KEY=${RMQ_ROUTING_KEY:-staging-smswithoutborders-routing-key}
234-
- RMQ_EXCHANGE=${RMQ_EXCHANGE:-staging-smswithoutborders-exchange}
235-
- RMQ_CONNECTION_NAME=${RMQ_CONNECTION_NAME:-staging-smswithoutborders-publisher}
236-
- RMQ_QUEUE_NAME=${RMQ_QUEUE_NAME:-staging-smswithoutborders-queue}
237-
238225
- IMAP_SERVER=${GATEWAY_SERVER_IMAP_SERVER:?err}
239226
- IMAP_PORT=${GATEWAY_SERVER_IMAP_PORT:-993}
240227
- IMAP_USERNAME=${GATEWAY_SERVER_IMAP_USERNAME:?err}
@@ -271,9 +258,6 @@ services:
271258
publisher:
272259
restart: unless-stopped
273260
container_name: publisher
274-
depends_on:
275-
rmq:
276-
condition: service_healthy
277261
build:
278262
context: ${PUBLISHER_PATH}
279263
dockerfile: Dockerfile
@@ -317,14 +301,6 @@ services:
317301

318302
- PUBLISHER_DECRYPTION_KEY=${PUBLISHER_ENCRYPTION_KEY:?err}
319303

320-
- RMQ_USER=${RABBITMQ_DEFAULT_USER:-guest}
321-
- RMQ_PASSWORD=${RABBITMQ_DEFAULT_PASS:-guest}
322-
- RMQ_HOST=${RMQ_HOST:-rmq}
323-
- RMQ_QUEUE_NAME=${RMQ_QUEUE_NAME:-staging-smswithoutborders-queue}
324-
- RMQ_ROUTING_KEY=${RMQ_ROUTING_KEY:-staging-smswithoutborders-routing-key}
325-
- RMQ_EXCHANGE=${RMQ_EXCHANGE:-staging-smswithoutborders-exchange}
326-
- RMQ_CONNECTION_NAME=${RMQ_CONNECTION_NAME:-staging-smswithoutborders-consumer}
327-
328304
- PLATFORMS_ADAPTERS_DIR=/usr/local/share/smswithoutborders/adapters
329305
- PLATFORMS_ADAPTERS_VENV_DIR=/usr/local/share/smswithoutborders/adapters-venv
330306
- PLATFORMS_ADAPTERS_ASSETS_DIR=/usr/local/share/smswithoutborders/adapters-assets
@@ -380,33 +356,6 @@ services:
380356
networks:
381357
- assembler_network
382358

383-
rmq:
384-
restart: unless-stopped
385-
container_name: rmq
386-
hostname: rmq-server
387-
logging:
388-
options:
389-
max-size: "10m"
390-
max-file: "3"
391-
build:
392-
context: ${RMQ_PATH}
393-
dockerfile: Dockerfile
394-
volumes:
395-
- ${SSL_CERTIFICATE_FILE:?err}:/etc/ssl/certs/smswithoutborders/server.crt
396-
- ${SSL_CERTIFICATE_KEY_FILE:?err}:/etc/ssl/certs/smswithoutborders/server.key
397-
- ${SSL_CERTIFICATE_CHAIN_FILE:?err}:/etc/ssl/certs/smswithoutborders/server.pem
398-
- rmq-data:/var/lib/rabbitmq/mnesia/
399-
healthcheck:
400-
test: ["CMD", "curl", "-f", "http://localhost:15672"]
401-
interval: 30s
402-
timeout: 10s
403-
retries: 5
404-
environment:
405-
- RABBITMQ_DEFAULT_USER=${RABBITMQ_DEFAULT_USER:-guest}
406-
- RABBITMQ_DEFAULT_PASS=${RABBITMQ_DEFAULT_PASS:-guest}
407-
networks:
408-
- assembler_network
409-
410359
telemetry-aggregator:
411360
restart: unless-stopped
412361
container_name: telemetry-aggregator
@@ -429,7 +378,6 @@ services:
429378

430379
volumes:
431380
db-data:
432-
rmq-data:
433381
keystore-data:
434382
static-keystore-data:
435383
telegram-data:

0 commit comments

Comments
 (0)