.gitea/workflows/demo.yaml

@@ -44,7 +44,6 @@ jobs:
             echo POSTGRES_DB=${{ secrets.POSTGRES_DB }} >> .env
             echo PGDATA=${{ secrets.PGDATA }} >> .env
             echo POSTGRES_URL=${{ secrets.POSTGRES_URL }} >> .env
-            echo DATABASE_URL_LOCAL_MIGRATE=${{ secrets.DATABASE_URL_LOCAL_MIGRATE }} >> .env
             echo REDIS_URL=${{ secrets.REDIS_URL }} >> .env
             echo BOT_TOKEN=${{ secrets.BOT_TOKEN }} >> .env
             docker-compose up -d

alembic/env.py

@@ -40,7 +40,7 @@ target_metadata = BaseDBModel.metadata
 section = config.get_section(config.config_ini_section, {})
 match section.get("sqlalchemy.url"):
     case "driver://user:pass@localhost/dbname":
-        url_db = os.getenv("DATABASE_URL_LOCAL_MIGRATE", 'postgresql+asyncpg://admin:admin@localhost:5433/postgresdb')
+        url_db = os.getenv("DATABASE_URL_LOCAL_MIGRATE")
         config.set_section_option(
             config.config_ini_section,
             "sqlalchemy.url",

docker-compose.yaml

@@ -20,8 +20,12 @@ services:
         volumes:
             - /root/telegrambot/volumes/postgres/pgdata:/var/lib/postgresql/data/pgdata
         restart: always
-        env_file:
+        environment:
-            - .env
+            - POSTGRES_DB=postgresdb
+            - POSTGRES_USER=admin
+            - POSTGRES_PASSWORD=admin
+            - PGDATA=/var/lib/postgresql/data/pgdata
+            - POSTGRES_HOST_AUTH_METHOD=trust
         deploy:
             resources:
                 limits:

makefile

@@ -1,6 +0,0 @@
-create_env:
-	python3 -m venv venv
-	./venv/bin/python -m pip install -r requirements.txt
-
-migrate: create_env
-	./venv/bin/alembic upgrade head