add-ui

Dockerfile

@@ -2,7 +2,7 @@
 FROM node:20-alpine AS builder
 WORKDIR /app
 
-# Install chromium dependencies for whatsapp-web.js
+# Install chromium build dependencies + git (for patch-package)
 RUN apk add --no-cache \
     chromium \
     nss \
@@ -15,13 +15,13 @@ RUN apk add --no-cache \
 # Copy package files
 COPY package*.json ./
 
-# Install dependencies
+# Install all dependencies (incl dev) for patch-package
 RUN npm ci --production=false
 
-# Copy patches directory if it exists
+# Copy patch directory if present
 COPY patches ./patches
 
-# Run postinstall (patch-package)
+# Apply patch-package (best-effort)
 RUN npm run postinstall || true
 
 # Copy application files
@@ -32,42 +32,40 @@ COPY swagger.yml ./
 FROM node:20-alpine
 WORKDIR /app
 
-# Install chromium and runtime dependencies
+# Install Chromium runtime dependencies + su-exec
 RUN apk add --no-cache \
     chromium \
     nss \
     freetype \
     harfbuzz \
     ca-certificates \
-    ttf-freefont
+    ttf-freefont \
+    su-exec
 
-# Tell Puppeteer to use installed chromium
+# Puppeteer / whatsapp-web.js settings
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true \
     PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser
 
-#RUN groupadd -r whatsapp && useradd -r -g whatsapp whatsapp
-#DEV  Create non-root user
-RUN addgroup -S whatsapp || true && \
-    adduser -D -S -G whatsapp whatsapp || true
+# Create non-root service user
+RUN addgroup -S whatsapp && \
+    adduser -D -S -G whatsapp whatsapp
 
-# Copy dependencies from builder
+# Copy node_modules from builder
 COPY --from=builder --chown=whatsapp:whatsapp /app/node_modules ./node_modules
 
-# Copy application files
+# Copy application code
 COPY --chown=whatsapp:whatsapp server.js ./
-COPY --chown=whatsapp:whatsapp package*.json ./
 COPY --chown=whatsapp:whatsapp swagger.yml ./
+COPY --chown=whatsapp:whatsapp package*.json ./
 
-# Create volume directories
-RUN mkdir -p /app/data /app/media /app/.wwebjs_cache /app/.wwebjs_auth && \
-    chown -R whatsapp:whatsapp /app
+# Pre-create required folders (will be overwritten by volumes)
+RUN mkdir -p /app/data /app/media /app/.wwebjs_cache /app/.wwebjs_auth
 
-USER whatsapp
+# ENTRYPOINT: fix permissions as root → switch to whatsapp → run server
+ENTRYPOINT ["sh", "-c", "\
+  mkdir -p /app/data /app/media /app/.wwebjs_cache /app/.wwebjs_auth && \
+  chown -R whatsapp:whatsapp /app && \
+  exec su-exec whatsapp node server.js \
+"]
 
 EXPOSE 3001
-
-# Health check
-HEALTHCHECK --interval=30s --timeout=10s --start-period=40s --retries=3 \
-    CMD node -e "require('http').get('http://localhost:3001/health', (r) => { process.exit(r.statusCode === 200 ? 0 : 1); }).on('error', () => process.exit(1));"
-
-CMD ["node", "server.js"]