First one (#8)

Reviewed-on: phoenix/textsender_api#8

docker-compose.yml

@@ -19,7 +19,7 @@ services:
       - textsender_api-network
     restart: unless-stopped # Optional: Restart policy
 
-  # --- Web API auth ---
+  # --- Auth API ---
   auth_api:
     build:
       # Might want to change the naming convention at some point for the repo names. textsender-models, textsender_auth, textesender-api, etc
@@ -44,23 +44,23 @@ services:
     # volumes:
     #  - ./path/to/your/web-api-repo:/app
 
-  # --- songparser service ---
-  catapult:
-    build:
-      context: ../catapult
-      ssh: ["default"]
-      dockerfile: Dockerfile
-    container_name: catapult
-    restart: unless-stopped
-    env_file:
-      - ../catapult/.env
-    depends_on:
-      - api
-      - main_db
-      - auth_api
-      - auth_db
-    networks:
-      - textsender_api-network
+  # --- catapult service ---
+#   catapult:
+#     build:
+#       context: ../catapult
+#       ssh: ["default"]
+#       dockerfile: Dockerfile
+#     container_name: catapult
+#     restart: unless-stopped
+#     env_file:
+#       - ../catapult/.env
+#     depends_on:
+#       - api
+#       - main_db
+#       - auth_api
+#       - auth_db
+#     networks:
+#       - textsender_api-network
 
 
   # PostgreSQL Database Service
@@ -70,9 +70,9 @@ services:
     container_name: textsender_api_db # Optional: Give the container a specific name
     environment:
       # These MUST match the user, password, and database name in the DATABASE_URL above
-      POSTGRES_USER: ${POSTGRES_MAIN_USER:-textsender_api}
-      POSTGRES_PASSWORD: ${POSTGRES_MAIN_PASSWORD:-password}
-      POSTGRES_DB: ${POSTGRES_MAIN_DB:-textsender_api_db}
+      POSTGRES_USER: ${DB_MAIN_USER:-textsender_api}
+      POSTGRES_PASSWORD: ${DB_MAIN_PASSWORD:-password}
+      POSTGRES_DB: ${DB_MAIN_NAME:-textsender_api_db}
     volumes:
       # Persist database data using a named volume
       - postgres_data:/var/lib/postgresql
@@ -96,9 +96,9 @@ services:
     container_name: textsender_api_auth_db # Optional: Give the container a specific name
     environment:
       # These MUST match the user, password, and database name in the DATABASE_URL above
-      POSTGRES_USER: ${POSTGRES_AUTH_USER:-textsender_api_op}
-      POSTGRES_PASSWORD: ${POSTGRES_AUTH_PASSWORD:-password}
-      POSTGRES_DB: ${POSTGRES_AUTH_DB:-textsender_api_auth_db}
+      POSTGRES_USER: ${DB_AUTH_USER:-textsender_auth}
+      POSTGRES_PASSWORD: ${DB_AUTH_PASSWORD:-password}
+      POSTGRES_DB: ${DB_AUTH_NAME:-textsender_auth_db}
     volumes:
       # Persist database data using a named volume
       - postgres_data_auth:/var/lib/postgresql