Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Rabbitmq version to 3.12 #286

Merged
merged 9 commits into from
Feb 14, 2024
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ services:
restart: "no"

queue:
image: rabbitmq:3.11.2-management
image: rabbitmq:3.12.9-management
environment:
RABBITMQ_DEFAULT_USER: ${RABBITMQ_USERNAME}
RABBITMQ_DEFAULT_PASS: ${RABBITMQ_PASSWORD}
Expand Down
2 changes: 1 addition & 1 deletion pixl_core/tests/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ services:

queue:
container_name: pixl-test-queue
image: rabbitmq:3.11.2-management
image: rabbitmq:3.12.9-management
environment:
RABBITMQ_DEFAULT_USER: guest
RABBITMQ_DEFAULT_PASS: guest
Expand Down
16 changes: 9 additions & 7 deletions pixl_imaging/tests/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ services:
orthanc-raw:
condition: service_started
healthcheck:
interval: 10s
timeout: 30s
retries: 5
interval: 5s
timeout: 5s
retries: 10
environment:
LOG_LEVEL: DEBUG
RABBITMQ_PASSWORD: guest
Expand All @@ -54,6 +54,7 @@ services:
- "9001:8000"

vna-qr:
platform: linux/amd64
stefpiatek marked this conversation as resolved.
Show resolved Hide resolved
image: osimis/orthanc:22.9.0-full-stable
environment:
ORTHANC_NAME: "VNAQR"
Expand All @@ -70,6 +71,7 @@ services:
- ${PWD}/../../test/vna_config/:/run/secrets:ro

orthanc-raw:
platform: linux/amd64
build:
context: ../../
dockerfile: ./docker/orthanc-raw/Dockerfile
Expand All @@ -93,12 +95,12 @@ services:

queue:
container_name: pixl-test-queue
image: rabbitmq:3.11.2-management
image: rabbitmq:3.12.9-management
healthcheck:
test: rabbitmq-diagnostics -q check_running
interval: 30s
timeout: 30s
retries: 3
interval: 5s
timeout: 5s
retries: 20
ports:
- "5672:5672"
- "15672:15672"
4 changes: 2 additions & 2 deletions pixl_imaging/tests/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ THIS_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
PACKAGE_DIR="${THIS_DIR%/*}"
cd "$PACKAGE_DIR"/tests || exit

docker compose up -d --build
docker compose up --wait --build
docker exec pixl-test-imaging-api /bin/bash -c "pytest -m processing"
docker compose down
docker compose down --volumes
1 change: 1 addition & 0 deletions test/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ networks:

services:
vna-qr:
platform: linux/amd64
image: osimis/orthanc:22.9.0-full-stable
environment:
ORTHANC_NAME: ${VNAQR_AE_TITLE}
Expand Down
Loading