From 35f17b59d525a7e862efccf743e7c72ac94e0b90 Mon Sep 17 00:00:00 2001
From: Sudo-Ivan <ivan@quad4.io>
Date: Fri, 2 Jan 2026 17:24:16 -0600
Subject: [PATCH] chore(docker): update Dockerfile to streamline build process
 with new Node.js and Python versions, add missing configuration files, and
 optimize dependency installation

---
 Dockerfile | 44 +++++++++++++++++---------------------------
 1 file changed, 17 insertions(+), 27 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0cf695f..914607d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,47 +1,37 @@
-# Build arguments
-ARG NODE_VERSION=20
-ARG NODE_ALPINE_SHA256=sha256:6a91081a440be0b57336fbc4ee87f3dab1a2fd6f80cdb355dcf960e13bda3b59
-ARG PYTHON_VERSION=3.11
-ARG PYTHON_ALPINE_SHA256=sha256:822ceb965f026bc47ee667e50a44309d2d81087780bbbf64f2005521781a3621
-
-# Build the frontend
-FROM node:${NODE_VERSION}-alpine@${NODE_ALPINE_SHA256} AS build-frontend
+FROM node:22-alpine@sha256:0340fa682d72068edf603c305bfbc10e23219fb0e40df58d9ea4d6f33a9798bf AS build-frontend
 
 WORKDIR /src
 
-# Copy required source files
-COPY package.json vite.config.js ./
+COPY package.json vite.config.js tailwind.config.js postcss.config.js ./
 COPY pnpm-lock.yaml ./
-COPY meshchatx ./meshchatx
+COPY meshchatx/src/frontend ./meshchatx/src/frontend
 
-# Install pnpm
 RUN corepack enable && corepack prepare pnpm@latest --activate
 
-# Install NodeJS deps, exluding electron
-RUN pnpm install --prod && \
-  pnpm run build-frontend
+RUN pnpm install --frozen-lockfile && \
+    pnpm run build-frontend
 
-# Main app build
-FROM python:${PYTHON_VERSION}-alpine@${PYTHON_ALPINE_SHA256}
+FROM python:3.13-alpine@sha256:e7e041128ffc3e3600509f508e44d34ab08ff432bdb62ec508d01dfc5ca459f7
 
 WORKDIR /app
 
-# Install Python deps
-COPY ./requirements.txt .
-RUN apk add --no-cache ffmpeg espeak-ng opusfile && \
-    apk add --no-cache --virtual .build-deps \
+RUN apk add --no-cache ffmpeg espeak-ng opusfile libffi-dev
+
+COPY pyproject.toml poetry.lock ./
+RUN apk add --no-cache --virtual .build-deps \
         gcc \
         musl-dev \
         linux-headers \
         python3-dev && \
-    pip install -r requirements.txt && \
+    pip install --no-cache-dir poetry && \
+    poetry config virtualenvs.create false && \
+    poetry install --no-root --only main && \
     apk del .build-deps
 
-# Copy prebuilt frontend
-COPY --from=build-frontend /src/meshchatx/public meshchatx/public
-
-# Copy other required source files
 COPY meshchatx ./meshchatx
-COPY pyproject.toml poetry.lock ./
+
+COPY --from=build-frontend /src/meshchatx/public ./meshchatx/public
+
+ENV PYTHONUNBUFFERED=1
 
 CMD ["python", "-m", "meshchatx.meshchat", "--host=0.0.0.0", "--reticulum-config-dir=/config/.reticulum", "--storage-dir=/config/.meshchat", "--headless"]