fix docker build and startup

Author: soof-golan

Dockerfile

@@ -15,8 +15,6 @@ WORKDIR /app
 # Copy the rest of the app
 COPY . /app
 
-WORKDIR /app
-
 # Run the production server
 EXPOSE 8000
 # CMD exec gunicorn --workers 1 --threads 8 --timeout 0 --preload main:app

server/config.py

@@ -39,7 +39,7 @@ class Config(BaseSettings):
     Whether or not the server is running in production mode (affects CORS origins and deployment triggers)
     """
 
-    database_url: SecretStr | None = Field(os.environ.get("SQLALCHEMY_DATABASE_URL"))
+    sqlalchemy_database_url: SecretStr | None = Field(os.environ.get("SQLALCHEMY_DATABASE_URL"))
     """
     The URL to the database (cockroachdb)
     """

server/db/user.py

@@ -11,10 +11,10 @@
 from starlette.authentication import UnauthenticatedUser
 from starlette.requests import Request
 
-from server.constants import TTL_FIVE_MINUTES
-from server.db.session import db_session
-from server.models import User as DbUser
-from server.types import FirebaseUser
+from ..constants import TTL_FIVE_MINUTES
+from ..db.session import db_session
+from ..models import User as DbUser
+from ..types import FirebaseUser
 
 
 class User(BaseModel):

server/db/waiting_room.py

@@ -8,8 +8,8 @@
 from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from server.constants import TTL_FIVE_MINUTES
-from server.models import WaitingRoom
+from ..constants import TTL_FIVE_MINUTES
+from ..models import WaitingRoom
 
 
 class CachedWaitingRoomQueryResult(BaseModel):

server/main.py

@@ -18,11 +18,11 @@
 from timing_asgi.integrations import StarletteScopeToName
 import sentry_sdk
 
-from server.config import CONFIG
-from server.constants import DEV_CORS_ORIGINS, log_config, PROD_CORS_ORIGINS
-from server.logger import logger
-from server.middleware.firebase import FirebaseAuthBackend
-from server.middleware.turnstile import TurnstileMiddleware
+from .config import CONFIG
+from .constants import DEV_CORS_ORIGINS, log_config, PROD_CORS_ORIGINS
+from .logger import logger
+from .middleware.firebase import FirebaseAuthBackend
+from .middleware.turnstile import TurnstileMiddleware
 from .routes import markdown_edit
 from .routes import register as register_routes
 from .routes import room
@@ -52,7 +52,7 @@ async def lifespan(_app: fastapi.FastAPI) -> typing.AsyncIterator[State]:
     logger.info("Config: %s", CONFIG)
 
     engine = create_async_engine(
-        CONFIG.database_url and CONFIG.database_url.get_secret_value(),
+        CONFIG.sqlalchemy_database_url and CONFIG.sqlalchemy_database_url.get_secret_value(),
         echo=not CONFIG.production,
         hide_parameters=CONFIG.production,
         pool_size=30,

server/middleware/firebase.py

@@ -13,9 +13,9 @@
 from starlette.authentication import AuthCredentials, AuthenticationError
 from starlette.requests import HTTPConnection
 
-from server.constants import TTL_FIVE_MINUTES
-from server.logger import logger
-from server.types import FirebaseUser
+from ..constants import TTL_FIVE_MINUTES
+from ..logger import logger
+from ..types import FirebaseUser
 
 
 

server/middleware/turnstile.py

@@ -6,9 +6,9 @@
 from starlette.responses import Response
 import httpx
 
-from server.config import CONFIG
-from server.logger import logger
-from server.types import TurnstileOutcome
+from ..config import CONFIG
+from ..logger import logger
+from ..types import TurnstileOutcome
 
 
 

server/middleware/user.py

@@ -3,10 +3,10 @@
 from fastapi import Request
 from starlette.responses import Response
 
-from server.db.session import create_session_maker
-from server.db.user import fetch_or_create_cached_user
-from server.logger import logger
-from server.types import FirebaseUser
+from ..db.session import create_session_maker
+from ..db.user import fetch_or_create_cached_user
+from ..logger import logger
+from ..types import FirebaseUser
 
 
 class UserMiddleware(BaseHTTPMiddleware):

server/routes/markdown_edit.py

@@ -8,9 +8,9 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 from starlette.authentication import requires
 
-from server.db.session import db_session
-from server.models import WaitingRoom
-from server.types import TrpcData, TrpcResponse
+from ..db.session import db_session
+from ..models import WaitingRoom
+from ..types import TrpcData, TrpcResponse
 
 router = fastapi.APIRouter()
 

server/routes/register.py

@@ -8,14 +8,14 @@
 from sqlalchemy import insert
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from server.constants import PLAY_NICE_RESPONSE
-from server.db.session import db_session
-from server.db.waiting_room import CachedWaitingRoomQueryResult, fetch_waiting_room
-from server.logger import logger
-from server.models import IdType, Registrant
-from server.trpc import TrpcMixin
-from server.turnstile import handle_turnstile_errors
-from server.types import TrpcResponse, TurnstileOutcome
+from ..constants import PLAY_NICE_RESPONSE
+from ..db.session import db_session
+from ..db.waiting_room import CachedWaitingRoomQueryResult, fetch_waiting_room
+from ..logger import logger
+from ..models import IdType, Registrant
+from ..trpc import TrpcMixin
+from ..turnstile import handle_turnstile_errors
+from ..types import TrpcResponse, TurnstileOutcome
 
 router = fastapi.APIRouter()
 

server/routes/room.py

@@ -11,13 +11,13 @@
 from sqlalchemy.ext.asyncio import AsyncConnection, AsyncSession
 from starlette.authentication import requires
 
-from server.db.user import User, authenticated_user
-from server.models import IdType, WaitingRoom, Registrant as DbRegistrant
-from server.config import CONFIG
-from server.db.session import db_session
-from server.logger import logger
-from server.trpc import trpc, TrpcMixin
-from server.types import TrpcResponse
+from ..db.user import User, authenticated_user
+from ..models import IdType, WaitingRoom, Registrant as DbRegistrant
+from ..config import CONFIG
+from ..db.session import db_session
+from ..logger import logger
+from ..trpc import trpc, TrpcMixin
+from ..types import TrpcResponse
 
 router = fastapi.APIRouter()
 

server/trpc.py

@@ -6,7 +6,7 @@
 import pydantic
 from pydantic import BaseModel
 
-from server.types import TrpcData, TrpcResponse
+from .types import TrpcData, TrpcResponse
 
 
 def decode_trpc_input(escaped_input: str) -> dict: