First more or less working version

Dockerfile

@@ -1,13 +1,14 @@
-# Start with PostgreSQL image with pgvector
-FROM pgvector/pgvector:pg16
+FROM pspdfkit/ai-assistant:nightly
 
 # Set environment variables
-ENV POSTGRES_USER=db-user \
+ENV HOME=/home/node \
+    PNPM_HOME=/root/.local/share/pnpm \
+    PATH=/root/.local/share/pnpm/bin:$PATH \
+    POSTGRES_USER=db-user \
     POSTGRES_PASSWORD=password \
     POSTGRES_DB=ai_assistant \
     POSTGRES_INITDB_ARGS=--data-checksums \
-    PGDATA=/var/lib/postgresql/data/pgdata \
-    OPENAI_API_KEY="dumy-key" \
+    PGDATA=/home/node/pgdata \
     PGUSER=db-user \
     PGPASSWORD=password \
     PGDATABASE=ai_assistant \
@@ -20,9 +21,25 @@ ENV POSTGRES_USER=db-user \
     DASHBOARD_PASSWORD=secret \
     SECRET_KEY_BASE=secret-key-base
 
-# Install required packages including nginx
-RUN apt-get update && \
-    apt-get install -y nodejs npm python3-venv python3-pip wget curl unzip nginx-light procps && \
+# Install system packages (as root)
+USER root
+RUN apk add --no-cache \
+    postgresql16 \
+    postgresql16-contrib \
+    py3-pip \
+    python3 \
+    py3-virtualenv \
+    wget \
+    curl \
+    unzip \
+    nginx \
+    procps \
+    build-base \
+    postgresql16-dev \
+    git && \
+    mkdir -p /run/postgresql && \
+    chown -R node:node /run/postgresql && \
+    # Install llamafiler
     mkdir -p /tmp/llamafile && \
     cd /tmp/llamafile && \
     wget --no-check-certificate https://github.com/Mozilla-Ocho/llamafile/releases/download/0.8.17/llamafile-0.8.17.zip && \
@@ -30,65 +47,65 @@ RUN apt-get update && \
     cp llamafile-0.8.17/bin/llamafiler /usr/local/bin/ && \
     chmod +x /usr/local/bin/llamafiler && \
     rm -rf /tmp/llamafile && \
-    # Create all required nginx directories and files with correct ownership and permissions
-    mkdir -p /var/run/nginx && \
-    mkdir -p /var/lib/nginx/body && \
-    mkdir -p /var/lib/nginx/proxy && \
-    mkdir -p /var/lib/nginx/fastcgi && \
-    mkdir -p /var/lib/nginx/uwsgi && \
-    mkdir -p /var/lib/nginx/scgi && \
-    mkdir -p /var/log/nginx && \
-    touch /var/log/nginx/access.log && \
-    touch /var/log/nginx/error.log && \
-    chmod 755 /var/lib && \
-    chmod 755 /var/log && \
-    chmod 755 /var/run && \
-    chown -R postgres:postgres /var/run/nginx /var/log/nginx /var/lib/nginx && \
-    chmod -R 755 /var/lib/nginx /var/log/nginx && \
-    chmod 777 /var/run/nginx && \
-    chmod 666 /var/log/nginx/access.log && \
-    chmod 666 /var/log/nginx/error.log
+    mkdir -p /root/.local/share/pnpm && \
+    chmod -R 755 /root/.local/share/pnpm && \
+    chown -R node:node /root/.local/share/pnpm && \
+    # Ensure prisma is executable from PATH
+    ln -s /base/node_modules/.pnpm/[email protected]/node_modules/prisma/node_modules/.bin/prisma /usr/local/bin/prisma && \
+    chmod +x /usr/local/bin/prisma
 
-# Create and activate virtual environment
-RUN python3 -m venv /venv
-ENV PATH="/venv/bin:$PATH"
+# Install nginx and set up directories for non-root usage
+RUN mkdir -p /var/cache/nginx \
+             /var/log/nginx \
+             /var/lib/nginx && \
+    touch /var/run/nginx.pid && \
+    chown -R node:node /var/cache/nginx \
+                      /var/log/nginx \
+                      /var/lib/nginx \
+                      /var/run/nginx.pid \
+                      /run/nginx
 
-# Install Flask in the virtual environment
-RUN /venv/bin/pip install flask
+# Copy application files to /base BEFORE switching user
+COPY --chown=node:node app.py service-config.yml /base/app/
+COPY --chown=node:node nginx.conf /etc/nginx/nginx.conf
+COPY --chown=node:node healthcheck.sh start-services.sh /base/app/
+COPY --chown=node:node service-config.yml /service-config.yml
 
-# Copy the Flask app
-COPY app.py /app.py
-COPY service-config.yml /service-config.yml
+# Create app directories and set up Python
+USER node
+RUN mkdir -p $HOME/models && \
+    mkdir -p $HOME/pgdata && \
+    python3 -m venv $HOME/venv && \
+    $HOME/venv/bin/pip install flask
 
-# Create a healthcheck script
-COPY healthcheck.sh /usr/local/bin/healthcheck.sh
-RUN chmod +x /usr/local/bin/healthcheck.sh
+# pgvector installation (needs root)
+USER root
+RUN git clone https://github.com/pgvector/pgvector.git && \
+    cd pgvector && \
+    make && \
+    make install && \
+    cd .. && \
+    rm -rf pgvector
 
-# Pull and extract the AI assistant image
-COPY --from=pspdfkit/ai-assistant:nightly / /ai-assistant
-COPY service-config.yml /ai-assistant/base/config/service-config.yml
+# Download models as node user
+USER node
+RUN wget -q https://huggingface.co/bartowski/gemma-2-2b-it-GGUF/resolve/main/gemma-2-2b-it-Q4_K_M.gguf -O $HOME/models/gemma-2b.gguf && \
+    wget -q https://huggingface.co/leliuga/all-MiniLM-L6-v2-GGUF/resolve/main/all-MiniLM-L6-v2.F16.gguf -O $HOME/models/embeddings.gguf && \
+    chmod +x /base/app/healthcheck.sh /base/app/start-services.sh
 
-# Copy and prepare start script
-COPY start-services.sh /start-services.sh
-RUN chmod +x /start-services.sh
-
-# Copy Nginx configuration
-COPY nginx.conf /etc/nginx/nginx.conf
-
-# Create base directory and download models during build
-RUN mkdir -p /base && \
-    wget -q https://huggingface.co/bartowski/gemma-2-2b-it-GGUF/resolve/main/gemma-2-2b-it-Q4_K_M.gguf -O /base/gemma-2b.gguf && \
-    wget -q https://huggingface.co/leliuga/all-MiniLM-L6-v2-GGUF/resolve/main/all-MiniLM-L6-v2.F16.gguf -O /base/embeddings.gguf && \
-    chown -R postgres:postgres /base
-
-# Expose ports
 EXPOSE 5432 7860 4000 8080 8081 8082
 
-# Add a healthcheck
-HEALTHCHECK --interval=3s --timeout=3s --retries=10 \
-  CMD ["healthcheck.sh"]
+USER root
 
-USER postgres
+# Fix permissions for the entire pnpm path
+RUN mkdir -p /root/.local/share/pnpm && \
+    chmod 755 /root && \
+    chmod 755 /root/.local && \
+    chmod 755 /root/.local/share && \
+    chmod -R 755 /root/.local/share/pnpm && \
+    chown -R node:node /root/.local/share/pnpm
 
-# Start PostgreSQL, Flask, and AI assistant
-CMD ["sh", "-c", "/venv/bin/flask run --host=0.0.0.0 --port=7860 & docker-entrypoint.sh postgres & /start-services.sh"]
+USER node
+WORKDIR /base
+ENTRYPOINT []
+CMD ["sh", "-c", "/base/app/start-services.sh"]

nginx.conf

@@ -1,30 +1,17 @@
-pid /var/run/nginx/nginx.pid;  
-
 events {
     worker_connections 1024;
 }
 
 http {
-    include       /etc/nginx/mime.types;
-    default_type  application/octet-stream;
-
     server {
         listen 8080;
         
         location /v1/embeddings {
-            proxy_pass http://127.0.0.1:8081;
-            proxy_set_header Host $host;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_read_timeout 300;
-            proxy_connect_timeout 300;
+            proxy_pass http://127.0.0.1:8081;            
         }
 
         location /v1 {
-            proxy_pass http://127.0.0.1:8082;
-            proxy_set_header Host $host;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_read_timeout 300;
-            proxy_connect_timeout 300;
+            proxy_pass http://127.0.0.1:8082;            
         }
     }
 }

start-services.sh

@@ -1,13 +1,10 @@
 #!/bin/sh
+set -e
 
-# Wait for PostgreSQL to be ready
-until pg_isready -h localhost -U db-user
-do
-    echo "Waiting for PostgreSQL to be ready..."
-    sleep 1
-done
+# 1. Start Flask (already started in the CMD)
+echo "Flask is running..."
 
-# Start nginx with explicit configuration
+# 2. Start Nginx
 echo "Starting nginx..."
 /usr/sbin/nginx -c /etc/nginx/nginx.conf
 if [ $? -ne 0 ]; then
@@ -20,21 +17,45 @@ if ! ps aux | grep nginx | grep -v grep > /dev/null; then
     echo "Nginx failed to start"
     exit 1
 fi
-
 echo "Nginx started successfully"
 
-# Start llamafiler instances
-echo "Starting llamafiler services..."
+# 3. Start PostgreSQL
+echo "Starting PostgreSQL..."
+if [ ! -f "$PGDATA/PG_VERSION" ]; then
+    mkdir -p $PGDATA
+    echo "Current user: $(whoami)"
+    initdb -D $PGDATA --username=postgres --pwfile=<(echo "password")
+fi
+pg_ctl -D $PGDATA start
 
-# Create TMPDIR if it doesn't exist
+# Create the db-user (but let Prisma handle the database)
+echo "Creating database user..."
+PGPASSWORD=password PGUSER=postgres createuser -s "db-user" || echo "User db-user already exists"
+PGPASSWORD=password PGUSER=postgres psql -c 'ALTER USER "db-user" WITH PASSWORD '\''password'\'';' postgres
+
+# Wait for PostgreSQL (using db-user)
+echo "Waiting for PostgreSQL..."
+until pg_isready -U db-user; do
+    echo "Waiting for PostgreSQL to be ready..."
+    sleep 2
+    if [ $SECONDS -gt 30 ]; then
+        echo "Timeout waiting for PostgreSQL"
+        exit 1
+    fi
+done
+
+echo "PostgreSQL is ready!"
+
+# 4. Start Llamafiler (reusing existing code)
+echo "Starting llamafiler services..."
 mkdir -p /tmp/llamafiler
 
 echo "Starting chat model..."
-TMPDIR=/tmp/llamafiler /usr/local/bin/llamafiler --model /base/gemma-2b.gguf --listen 0.0.0.0:8082 &
+TMPDIR=/tmp/llamafiler /usr/local/bin/llamafiler --model $HOME/models/gemma-2b.gguf --listen 0.0.0.0:8082 &
 GEMMA_PID=$!
 
 echo "Starting embedding model..."
-TMPDIR=/tmp/llamafiler /usr/local/bin/llamafiler --model /base/embeddings.gguf --listen 0.0.0.0:8081 &
+TMPDIR=/tmp/llamafiler /usr/local/bin/llamafiler --model $HOME/models/embeddings.gguf --listen 0.0.0.0:8081 &
 EMBEDDINGS_PID=$!
 
 # Wait for the models to start loading
@@ -65,8 +86,28 @@ done
 
 echo 'Servers are ready!'
 
-# Start the AI assistant application from the correct directory
-cd /ai-assistant/base && \
-NODE_PATH=/ai-assistant/base/node_modules \
-PATH=/ai-assistant/base/node_modules/.bin:/ai-assistant/base/bin:$PATH \
-     exec /ai-assistant/base/bin/entrypoint.sh node app/main.bundle.js
+echo 'All services are ready!'
+
+# Ensure we have the same environment as the base image
+export PNPM_HOME=/root/.local/share/pnpm
+export PATH=$PNPM_HOME/bin:$PATH
+cd /base  # Ensure we're in the correct directory
+
+echo "=== After Environment Setup ==="
+echo "New working directory: $(pwd)"
+echo "Updated PATH: $PATH"
+echo "Contents of prisma directory:"
+ls -la prisma/
+echo "NODE_PATH environment: $NODE_PATH"
+echo "PNPM_HOME contents:"
+ls -la $PNPM_HOME
+echo "Global node_modules:"
+ls -la $PNPM_HOME/global/5/node_modules/@prisma || echo "No global prisma found"
+echo "Local prisma version:"
+prisma -v
+echo "======================="
+
+# Now execute the entrypoint with the proper environment
+echo "Executing: /base/bin/entrypoint.sh node /base/app/main.bundle.js"
+set -x  # Enable command tracing
+exec /base/bin/entrypoint.sh node /base/app/main.bundle.js