From 870771b245a0331540426c87858c882d59de0ee1 Mon Sep 17 00:00:00 2001 From: Mark Winterbottom Date: Tue, 20 Apr 2021 14:02:20 +0100 Subject: [PATCH 1/2] Updated docker compose and GitLab CI. --- .github/workflows/checks.yml | 2 +- docker-compose.yml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 4d04b93b2..f48958512 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -11,6 +11,6 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Test - run: docker-compose run --rm app sh -c "python manage.py test" + run: docker-compose run --rm app sh -c "python manage.py wait_for_db && python manage.py test" - name: Lint run: docker-compose run --rm app sh -c "flake8" diff --git a/docker-compose.yml b/docker-compose.yml index 23f68f000..e4b40e9cd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,9 @@ services: volumes: - ./app:/app command: > - sh -c "python manage.py runserver 0.0.0.0:8000" + sh -c "python manage.py wait_for_db && + python manage.py migrate && + python manage.py runserver 0.0.0.0:8000" environment: - DB_HOST=db - DB_NAME=devdb From 1d63f369955a78bd7029fcf9275fea1ae9c93bde Mon Sep 17 00:00:00 2001 From: Mark Winterbottom Date: Sun, 27 Apr 2025 15:55:12 +0100 Subject: [PATCH 2/2] added wait_for_db --- .github/workflows/checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index f50e1e905..466f67219 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -16,6 +16,6 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Test - run: docker compose run --rm app sh -c "python manage.py test" + run: docker compose run --rm app sh -c "python manage.py wait_for_db && python manage.py test" - name: Lint run: docker compose run --rm app sh -c "flake8"