From eb2745704f0125555243f7104ccebc15064be88e Mon Sep 17 00:00:00 2001 From: Mart Ratas Date: Mon, 9 Nov 2026 10:54:12 +0000 Subject: [PATCH 1/2] Switch from docker-compose to docker compose --- .github/workflows/medcat-model-distributor_build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/medcat-model-distributor_build.yml b/.github/workflows/medcat-model-distributor_build.yml index 47b012db4..26be42f26 100644 --- a/.github/workflows/medcat-model-distributor_build.yml +++ b/.github/workflows/medcat-model-distributor_build.yml @@ -38,22 +38,22 @@ jobs: df -h # Optional: Check space before build - name: Set up Docker Compose - run: sudo apt-get update && sudo apt-get install -y docker-compose + run: sudo apt-get update && sudo apt-get install -y docker compose - name: Build and start containers - run: docker-compose -f docker-compose-test.yml up -d --build + run: docker compose -f docker compose-test.yml up -d --build - name: Run integration test run: ./tests/test_integration.sh --model-file webapp/manage.py - name: Check container logs for errors run: | - docker-compose logs medcatweb + docker compose logs medcatweb # NOTE: ignore line "Applying auth.0007_alter_validators_add_error_messages" - not an error - docker-compose logs medcatweb | grep -v "Applying auth.0007_alter_validators_add_error_messages" | grep -i 'error' && exit 1 || true + docker compose logs medcatweb | grep -v "Applying auth.0007_alter_validators_add_error_messages" | grep -i 'error' && exit 1 || true - name: Tear down - run: docker-compose -f docker-compose-test.yml down + run: docker compose -f docker compose-test.yml down publish-to-docker-hub: runs-on: ubuntu-latest From 4abdb3f65f65c112df93af4aaf6d938997d8fb28 Mon Sep 17 00:00:00 2001 From: Mart Ratas Date: Mon, 9 Nov 2026 11:09:35 +0000 Subject: [PATCH 2/2] Remove overly eager find-replace --- .github/workflows/medcat-model-distributor_build.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/medcat-model-distributor_build.yml b/.github/workflows/medcat-model-distributor_build.yml index 26be42f26..767d5ad88 100644 --- a/.github/workflows/medcat-model-distributor_build.yml +++ b/.github/workflows/medcat-model-distributor_build.yml @@ -37,11 +37,8 @@ jobs: sudo apt-get clean df -h # Optional: Check space before build - - name: Set up Docker Compose - run: sudo apt-get update && sudo apt-get install -y docker compose - - name: Build and start containers - run: docker compose -f docker compose-test.yml up -d --build + run: docker compose -f docker-compose-test.yml up -d --build - name: Run integration test run: ./tests/test_integration.sh --model-file webapp/manage.py @@ -53,7 +50,7 @@ jobs: docker compose logs medcatweb | grep -v "Applying auth.0007_alter_validators_add_error_messages" | grep -i 'error' && exit 1 || true - name: Tear down - run: docker compose -f docker compose-test.yml down + run: docker compose -f docker-compose-test.yml down publish-to-docker-hub: runs-on: ubuntu-latest