Better docker build

Author: dyakovri

.github/workflows/build_and_publish.yml

@@ -43,6 +43,7 @@ jobs:
       - name: Build and push Docker image
         uses: docker/build-push-action@v4
         with:
+          file: build/Dockerfile
           context: .
           push: true
           tags: ${{ steps.meta.outputs.tags }}
@@ -66,17 +67,6 @@ jobs:
       - name: Pull new version
         run: docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:test
 
-      - name: Migrate DB
-        run: |
-          docker run \
-            --rm \
-            --network=web \
-            --env DB_DSN=${{ secrets.DB_DSN }} \
-            --name ${{ env.CONTAINER_NAME }}_migration \
-            --workdir="/" \
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:test \
-            alembic upgrade head
-
       - name: Run new version
         id: run_test
         run: |
@@ -158,19 +148,8 @@ jobs:
       - name: Pull new version
         run: docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
 
-      - name: Migrate DB
-        run: |
-          docker run \
-            --rm \
-            --network=web \
-            --env DB_DSN=${{ secrets.DB_DSN }} \
-            --name ${{ env.CONTAINER_NAME }}_migration \
-            --workdir="/" \
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest \
-            alembic upgrade head
-
       - name: Run new version
-        id: run_test
+        id: run_prod
         run: |
           docker stop ${{ env.CONTAINER_NAME }} || true && docker rm ${{ env.CONTAINER_NAME }} || true
           docker run \

.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+    "python.testing.pytestArgs": [
+        "tests"
+    ],
+    "python.testing.unittestEnabled": false,
+    "python.testing.pytestEnabled": true
+}

Dockerfile

@@ -1,7 +1,7 @@
 SHELL := /bin/bash
 
 run:
-	source ./venv/bin/activate && uvicorn --reload --log-config logging_dev.conf auth_backend.routes.base:app
+	source ./venv/bin/activate && uvicorn --reload --log-config deploy/logging_dev.conf auth_backend.routes.base:app
 
 configure: venv
 	source ./venv/bin/activate && pip install -r requirements.dev.txt -r requirements.txt
@@ -23,6 +23,9 @@ format:
 db:
 	docker run -d -p 5432:5432 -e POSTGRES_HOST_AUTH_METHOD=trust --name db-auth_api postgres:15
 
+db-cleanup:
+	alembic downgrade head-"$(alembic heads | wc -l | sed 's/ //g')"
+	alembic upgrade head
 
 migrate:
 	source ./venv/bin/activate && alembic upgrade head

Makefile

@@ -1,4 +1,4 @@
 import os
 
 
-__version__ = os.getenv('APP_VERSION', 'dev')
+__version__ = os.getenv('APP_VERSION', 'v0.0.0-dev')

auth_backend/__init__.py

@@ -135,7 +135,11 @@ class Session(Base):
     is_unbounded: bool | None = None
     session_scopes: list[Scope] | None = None
     last_activity: datetime
-
+    # JWT OIDC Fields
+    expires_in: int
+    access_token: str
+    refresh_token: int
+    token_type: str
 
 class SessionPost(Base):
     session_name: str | None = None

auth_backend/schemas/models.py

@@ -0,0 +1,15 @@
+FROM tiangolo/uvicorn-gunicorn-fastapi:python3.11
+ARG APP_VERSION=v0.0.0-dev
+ENV APP_VERSION=${APP_VERSION}
+ENV APP_NAME=auth_backend
+ENV APP_MODULE=${APP_NAME}.routes.base:app
+
+# Копируем файлы зависимостей и устанавливаем их
+COPY ./requirements.txt /app/
+RUN pip install -U -r /app/requirements.txt
+
+# Копируем сопуствующие файлы
+COPY ./deploy/prestart.sh ./deploy/logging_dev.conf ./deploy/logging_test.conf ./deploy/logging_prod.conf ./migrations ./alembic.ini /app/
+
+# Копируем сам проект
+COPY ./${APP_NAME} /app/${APP_NAME}