Docker Compose Environment override fix

plastic-labs · May 13, 2024 · 38e5572 · 38e5572
1 parent 0eba9db
commit 38e5572
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/api/.dockerignore b/api/.dockerignore
@@ -1 +1,2 @@
 fly.toml
+.env
diff --git a/api/src/db.py b/api/src/db.py
@@ -5,7 +5,7 @@
 from sqlalchemy.ext.asyncio import async_sessionmaker, create_async_engine
 from sqlalchemy.ext.declarative import declarative_base
 
-load_dotenv(override=True)
+load_dotenv()
 
 connect_args = {}
 
@@ -15,7 +15,10 @@
     connect_args = {"check_same_thread": False}
 
 engine = create_async_engine(
-    os.environ["CONNECTION_URI"], connect_args=connect_args, echo=True
+    os.environ["CONNECTION_URI"],
+    connect_args=connect_args,
+    echo=True,
+    pool_pre_ping=True,
 )
 
 SessionLocal = async_sessionmaker(autocommit=False, autoflush=False, bind=engine)
@@ -26,6 +29,11 @@ def scaffold_db():
     """use a sync engine for scaffolding the database. ddl operations are unavailable
     with async engines
     """
-    engine = create_engine(os.environ["CONNECTION_URI"], echo=True)
+    print(os.environ["CONNECTION_URI"])
+    engine = create_engine(
+        os.environ["CONNECTION_URI"],
+        pool_pre_ping=True,
+        echo=True,
+    )
     Base.metadata.create_all(bind=engine)
     engine.dispose()