update docker compose and cicd

ytliuSVN · Nov 2, 2024 · 2b0e909 · 2b0e909
1 parent fa3e5f3
commit 2b0e909
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -3,18 +3,18 @@ name: Checks
 on: [push]
 
 jobs:
-    test-lint:
-        name: Test and Lint
-        runs-on: ubuntu-20.04
-        steps:
-            - name: Login to Docker Hub
-              uses: docker/login-action@v1
-              with:
-                username: ${{ secrets.DOCKERHUB_USER }}
-                password: ${{ secrets.DOCKERHUB_TOKEN }}
-            - name: Checkout
-              uses: actions/checkout@v2
-            - name: Test
-              run: docker compose run --rm app sh -c "python manage.py test"
-            - name: Lint
-              run: docker compose run --rm app sh -c "flake8"
+  test-lint:
+    name: Test and Lint
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USER }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: 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
@@ -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