Make database url configurable (#130)

.devcontainer/Dockerfile

@@ -16,7 +16,8 @@ RUN sed -i '1s;^;host all postgres samenet trust\n;' /etc/postgresql/16/main/pg_
 # python venv must be installed through apt
 RUN apt install -y python3.11 python3.11-venv sudo git
 
-ENV ENV=development
+ENV ENVIRONMENT=development
+ENV DATABASE_URL="postgresql+psycopg://postgres:password@localhost:5432/postgres"
 
 # In prod we must NOT run our container with root user, security risk. 
 # In the future I think we should use non-root user event in dev to make environment similar to prod

.dockerignore

@@ -0,0 +1 @@
+Dockerfile

Dockerfile

@@ -1,18 +1,11 @@
-FROM debian:12.7
+FROM python:3.12-slim
 
 ENV ENVIRONMENT=production
 
 ARG USERNAME=deployuser
 ARG USER_UID=1000
 ARG USER_GID=$USER_UID
 
-RUN apt update -y && \
-    apt install -y postgresql-common && \
-    /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y && \
-    apt install -y postgresql-16 sed python3.11 python3.11-venv sudo git && \
-    sed -i '1s;^;host all postgres samenet md5\n;' /etc/postgresql/16/main/pg_hba.conf && \
-    apt clean && rm -rf /var/lib/apt/lists/*
-
 RUN groupadd --gid $USER_GID $USERNAME && \
     useradd --uid $USER_UID --gid $USER_GID -m $USERNAME && \
     apt-get update && \
@@ -24,12 +17,12 @@ USER $USERNAME
 
 WORKDIR /app
 
-RUN python3.11 -m venv venv
+RUN python3 -m venv venv
 
 COPY . .
 
-RUN . venv/bin/activate && pip install --no-cache-dir -r requirements.txt
+RUN . venv/bin/activate && pip install --no-cache-dir -r requirements.txt && pip install psycopg2-binary
 
 EXPOSE 8000
 
-CMD ["uvicorn", "main:app" ,"--host", "0.0.0.0", "--port", "8000"]
+CMD ["venv/bin/uvicorn", "main:app" ,"--host", "0.0.0.0", "--port", "8000"]

database.py

@@ -4,10 +4,11 @@
 from sqlalchemy.orm import sessionmaker, Session
 from db_models import base_model
 from db_models import *
+import os
 
 
 # SQLALCHEMY_DATABASE_URL = "sqlite:///./database.sqlite"
-SQLALCHEMY_DATABASE_URL = "postgresql+psycopg://postgres:password@localhost:5432/postgres"
+SQLALCHEMY_DATABASE_URL = os.getenv("DATABASE_URL")
 
 engine = create_engine(SQLALCHEMY_DATABASE_URL)
 session_factory = sessionmaker(engine, expire_on_commit=False)

main.py

@@ -18,7 +18,7 @@ def generate_unique_id(route: APIRoute):
 
 @asynccontextmanager
 async def lifespan(app: FastAPI):
-    if os.getenv("ENV") == "development":
+    if os.getenv("ENVIRONMENT") == "development":
         # Not needed if you setup a migration system like Alembic
         init_db()
         with session_factory() as db:
@@ -29,7 +29,7 @@ async def lifespan(app: FastAPI):
 
 
 # No Swagger/OpenAPI page for production
-no_docs = os.getenv("ENV") == "production"
+no_docs = os.getenv("ENVIRONMENT") == "production"
 
 dev_origins = [
     "http://localhost",
@@ -43,7 +43,7 @@ async def lifespan(app: FastAPI):
     generate_unique_id_function=generate_unique_id,
 )
 
-if os.getenv("ENV") == "development":
+if os.getenv("ENVIRONMENT") == "development":
     app.add_middleware(
         CORSMiddleware,
         allow_origins=dev_origins,