merge main

Author: jthrilly

.dockerignore

@@ -18,5 +18,6 @@ Thumbs.db
 tests/
 docs/
 *.md
+storybook-static/
 !package.json
 !pnpm-lock.yaml

Dockerfile

@@ -42,6 +42,7 @@ COPY . .
 # Set environment variables for build - they are provided at runtime
 ENV SKIP_ENV_VALIDATION=true
 ENV NODE_ENV=production
+ENV NODE_OPTIONS="--max-old-space-size=4096"
 
 # Enable pnpm and build
 RUN corepack enable pnpm && pnpm run build

docker-compose.prod.yml

@@ -1,8 +1,6 @@
 services:
   fresco:
-    env_file:
-      - .env
-    image: "ghcr.io/complexdatacollective/fresco:feature-docker"
+    image: "ghcr.io/complexdatacollective/fresco:latest"
     depends_on:
       postgres:
         condition: service_healthy
@@ -13,16 +11,23 @@ services:
       - 0:3000
     networks:
       - fresco_network
+    environment:
+      DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/fresco
+      DATABASE_URL_UNPOOLED: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/fresco
+    env_file:
+      - .env
 
   postgres:
     image: postgres:16-alpine
     restart: always
+    environment:
+      POSTGRES_DB: fresco
     env_file:
       - .env
     volumes:
-      - postgres:/var/lib/postgresql/data
+      - postgres:/var/lib/postgresql/fresco_data
     healthcheck:
-      test: ["CMD", "pg_isready", '-U', 'postgres']
+      test: ["CMD", "pg_isready", '-U', '${POSTGRES_USER}']
       interval: 5s
       timeout: 10s
       retries: 5

migrate-and-start.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
+set -e
 
 node setup-database.js
 node initialize.js
-node server.js
+exec node server.js