fix docker builds

Author: alext-extracellular

.dockerignore

@@ -0,0 +1,30 @@
+# Dependency directories
+# We want the container to run its own 'npm install'
+node_modules/
+npm-debug.log
+yarn-error.log
+
+# Git metadata
+.git
+.gitignore
+
+# Local build artifacts and caches
+dist/
+build/
+.cache/
+.npm/
+
+# OS-specific files
+.DS_Store
+Thumbs.db
+
+# Docker-related files
+Dockerfile
+.dockerignore
+docker-compose.yml
+
+# Large data or temp files
+*.tar
+*.zip
+*.log
+tmp/

Dockerfile

@@ -1,75 +1,57 @@
-FROM node:18-bookworm
+# --- STAGE 1: The Builder ---
+FROM node:18-bookworm AS builder
 
 ARG NODE_SNAP=false
+WORKDIR /usr/src/app/FUXA
 
-RUN apt-get update && apt-get install -y dos2unix
+# Install ONLY what is needed to compile
+RUN apt-get update && apt-get install -y \
+    dos2unix build-essential unixodbc-dev sqlite3 libsqlite3-dev \
+    && rm -rf /var/lib/apt/lists/*
 
-# Change working directory
-WORKDIR /usr/src/app
-
-# Clone FUXA repository
-RUN git clone https://github.com/frangoteam/FUXA.git
-
-# Install build dependencies for node-odbc
-RUN apt-get update && apt-get install -y build-essential unixodbc unixodbc-dev
-
-# Convert the script to Unix format and make it executable
-RUN dos2unix FUXA/odbc/install_odbc_drivers.sh && chmod +x FUXA/odbc/install_odbc_drivers.sh
-
-WORKDIR /usr/src/app/FUXA/odbc
-RUN ./install_odbc_drivers.sh
+# Copy only dependency files first to leverage caching
+COPY server/package*.json ./server/
+WORKDIR /usr/src/app/FUXA/server
 
-# Change working directory
-WORKDIR /usr/src/app
+# Optimized NPM for speed
+RUN npm config set audit false && npm config set fund false
+RUN npm install --no-audit --no-fund --network-timeout=600000
 
-# Copy odbcinst.ini to /etc
-RUN cp FUXA/odbc/odbcinst.ini /etc/odbcinst.ini
+# Install snap7 if requested
+RUN if [ "$NODE_SNAP" = "true" ]; then npm install node-snap7; fi
 
-# Install Fuxa server
-WORKDIR /usr/src/app/FUXA/server
+# Rebuild sqlite3 for the container architecture
+RUN npm install --build-from-source --sqlite=/usr/bin sqlite3
 
-# More tolerant npm config
-ENV NODE_OPTIONS=--dns-result-order=ipv4first
-RUN npm config set registry https://registry.npmjs.org/ \
- && npm config set fetch-retries 8 \
- && npm config set fetch-retry-factor 2 \
- && npm config set fetch-retry-mintimeout 30000 \
- && npm config set fetch-retry-maxtimeout 300000 \
- && npm config set audit false \
- && npm config set fund false
+# Now copy the rest of the source code
+WORKDIR /usr/src/app/FUXA
+COPY . .
 
-# Retry loop con backoff + timeout alto
-RUN bash -lc '\
-  for i in 1 2 3 4 5 6 7 8; do \
-    echo "npm install - attempt $i/8"; \
-    npm install --no-audit --no-fund --prefer-offline --network-timeout=600000 && exit 0; \
-    echo "Failed, wait $((10*i))s and try again..."; \
-    sleep $((10*i)); \
-  done; \
-  echo "npm install failed after 8 attempts"; \
-  exit 1'
+# Run the driver scripts (only needed for the setup files they generate)
+RUN dos2unix odbc/install_odbc_drivers.sh && \
+    chmod +x odbc/install_odbc_drivers.sh
 
+# --- STAGE 2: The Runner (Final Image) ---
+FROM node:18-bookworm-slim
 
-# Install options snap7
-RUN if [ "$NODE_SNAP" = "true" ]; then \
-    npm install node-snap7; \
-    fi
+WORKDIR /usr/src/app/FUXA
 
-# Workaround for sqlite3 https://stackoverflow.com/questions/71894884/sqlite3-err-dlopen-failed-version-glibc-2-29-not-found
-RUN apt-get update && apt-get install -y sqlite3 libsqlite3-dev && \
-    apt-get autoremove -yqq --purge && \
-    apt-get clean  && \
-    rm -rf /var/lib/apt/lists/*  && \
-    npm install --build-from-source --sqlite=/usr/bin sqlite3
+# Install ONLY the runtime libraries (no compilers/build-essential)
+RUN apt-get update && apt-get install -y \
+    unixodbc sqlite3 libsqlite3-dev \
+    && rm -rf /var/lib/apt/lists/*
 
-# Add project files
-ADD . /usr/src/app/FUXA
+# Copy ONLY the necessary artifacts from the builder
+COPY --from=builder /usr/src/app/FUXA/server ./server
+COPY --from=builder /usr/src/app/FUXA/app ./app
+COPY --from=builder /usr/src/app/FUXA/client ./client
+COPY --from=builder /usr/src/app/FUXA/node-red ./node-red
+COPY --from=builder /usr/src/app/FUXA/odbc ./odbc
+COPY --from=builder /usr/src/app/FUXA/odbc/odbcinst.ini /etc/odbcinst.ini
 
-# Set working directory
+# Set environment and expose
 WORKDIR /usr/src/app/FUXA/server
-
-# Expose port
+ENV NODE_ENV=production
 EXPOSE 1881
 
-# Start the server
 CMD [ "npm", "start" ]