Upload 2 files

Dockerfile

@@ -17,20 +17,6 @@ COPY client/ ./
 # Build client
 RUN npm run build
 
-# Build the server
-FROM node:18-alpine AS server-builder
-
-WORKDIR /app
-
-# Copy server package files
-COPY server/package*.json ./
-
-# Install server dependencies
-RUN npm install --only=production
-
-# Copy server source
-COPY server/ ./server/
-
 # Production image
 FROM node:18-alpine
 
@@ -40,10 +26,17 @@ RUN apk add --no-cache nginx
 # Create app directory
 WORKDIR /app
 
-# Copy server files
-COPY --from=server-builder /app/server ./
+# Copy package files for server
+COPY server/package*.json ./
+
+# Install server dependencies
+RUN npm install --only=production
+
+# Copy server source
+COPY server/ ./
 
-# Copy client build to nginx
+# Create directory for nginx and copy client build
+RUN mkdir -p /usr/share/nginx/html
 COPY --from=client-builder /app/dist /usr/share/nginx/html
 
 # Copy nginx configuration
@@ -55,6 +48,11 @@ COPY startup.sh .
 # Make startup script executable
 RUN chmod +x startup.sh
 
+# Create nginx directories with proper permissions
+RUN mkdir -p /var/lib/nginx/tmp/client_body && \
+    chmod -R 755 /var/lib/nginx && \
+    chown -R nginx:nginx /var/lib/nginx
+
 # Expose ports
 EXPOSE 80 3001
 

startup.sh

@@ -1,10 +1,23 @@
 #!/bin/sh
 
+# Create log directory if it doesn't exist
+mkdir -p /var/log
+
 # Start the Node.js server in the background
-node index.js &
+node index.js > /var/log/node-server.log 2>&1 &
+NODE_PID=$!
 
 # Give the server a moment to start
-sleep 3
+sleep 5
+
+# Check if the server is running
+if ! kill -0 $NODE_PID 2>/dev/null; then
+    echo "Node.js server failed to start. Check logs in /var/log/node-server.log"
+    exit 1
+fi
+
+echo "Node.js server started with PID $NODE_PID"
 
 # Start nginx in the foreground
+echo "Starting nginx..."
 nginx -g "daemon off;"