Upload 5 files

Dockerfile

@@ -29,7 +29,7 @@ COPY server/package*.json ./
 RUN npm install --only=production
 
 # Copy server source
-COPY server/ ./
+COPY server/ ./server/
 
 # Production image
 FROM node:18-alpine
@@ -40,14 +40,14 @@ RUN apk add --no-cache nginx
 # Create app directory
 WORKDIR /app
 
-# Copy server build
-COPY --from=server-builder /app ./
+# Copy server files
+COPY --from=server-builder /app/server ./
 
 # Copy client build to nginx
 COPY --from=client-builder /app/dist /usr/share/nginx/html
 
 # Copy nginx configuration
-COPY client/nginx.conf /etc/nginx/nginx.conf
+COPY client/nginx.conf /etc/nginx/http.d/default.conf
 
 # Copy startup script
 COPY startup.sh .
@@ -58,9 +58,5 @@ RUN chmod +x startup.sh
 # Expose ports
 EXPOSE 80 3001
 
-# Health check
-HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
-  CMD curl -f http://localhost/health || exit 1
-
 # Start both nginx and node server
 CMD ["./startup.sh"]

startup.bat

@@ -1,6 +1,9 @@
 @echo off
-REM Start nginx in the background
-start nginx
+REM Start the Node.js server in the background
+start node index.js
 
-REM Start the Node.js server
-node server/index.js
+REM Give the server a moment to start
+timeout /t 3 /nobreak >nul
+
+REM Start nginx in the foreground
+nginx -g "daemon off;"

startup.sh

@@ -1,7 +1,10 @@
 #!/bin/sh
 
-# Start nginx in the background
-nginx &
+# Start the Node.js server in the background
+node index.js &
 
-# Start the Node.js server
-node server/index.js
+# Give the server a moment to start
+sleep 3
+
+# Start nginx in the foreground
+nginx -g "daemon off;"