envs in compose

Author: danschmidt5189

Dockerfile

@@ -21,7 +21,6 @@ COPY CHANGELOG.rst CHANGELOG.rst
 COPY public public
 COPY chainlit.md chainlit.md
 COPY .chainlit .chainlit
-COPY env.example env.example
 RUN pip install -e .
 
 ENV VIRTUAL_ENV=/venv

docker-compose.ci.yml

@@ -6,12 +6,8 @@ services:
     build: !reset
     depends_on: !reset
     ports: !reset
-    environment:
-      CHAT_BACKEND: ollama
-      DEFAULT_STORAGE_DIR: /tmp
-      EMBED_BACKEND: ollama
-    volumes: !override
-      - ./env.example:/app/.env:ro
+    env_file: !override env.example
+    volumes: !reset
 
   ollama: !reset
 

docker-compose.yml

@@ -4,15 +4,15 @@ services:
     restart: always
     environment: &dbconfig
       POSTGRES_DB: ${POSTGRES_DB:-willa}
-      POSTGRES_USER: ${POSTGRES_USER:-root}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-root}
-      DATABASE_URL: ${DATABASE_URL:-postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db/${POSTGRES_DB}}
+      POSTGRES_USER: ${POSTGRES_USER:-postgres}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-postgres}
+      DATABASE_URL: ${DATABASE_URL:-postgresql://${POSTGRES_USER:-postgres}:${POSTGRES_PASSWORD:-postgres}@db/${POSTGRES_DB:-willa}}
     ports:
       - 5432:5432
     volumes:
       - ./.data/postgres:/var/lib/postgresql/data
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
+      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-postgres} -d ${POSTGRES_DB:-willa}"]
       interval: 10s
       timeout: 5s
       retries: 5