From 0ef84c77d3e4c332f49f5534c74d51ca5489fd46 Mon Sep 17 00:00:00 2001 From: Claude Date: Fri, 21 Nov 2025 12:15:24 +0000 Subject: [PATCH] fix: Resolve Docker build failures for frontend and backend Backend fixes: - Add linux-libc-dev and libc6-dev to support psutil compilation on ARM/aarch64 - Update psutil from 6.1.0 to 6.1.1 for better wheel support Frontend fixes: - Create missing lib/utils.ts with cn utility function - Resolves "Module not found: Can't resolve '@/lib/utils'" error - Uses clsx and tailwind-merge for className merging These changes ensure successful Docker builds for both services. --- backend/Dockerfile | 2 ++ backend/requirements.txt | 2 +- frontend/lib/utils.ts | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 frontend/lib/utils.ts diff --git a/backend/Dockerfile b/backend/Dockerfile index 7fe7d5f..ec17745 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -9,6 +9,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ g++ \ python3-dev \ build-essential \ + linux-libc-dev \ + libc6-dev \ && rm -rf /var/lib/apt/lists/* # Copy requirements and install dependencies diff --git a/backend/requirements.txt b/backend/requirements.txt index 8361db3..5646828 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -7,7 +7,7 @@ pydantic-settings==2.1.0 python-jose[cryptography]==3.3.0 passlib[bcrypt]==1.7.4 python-multipart==0.0.9 -psutil==6.1.0 +psutil==6.1.1 aiosqlite==0.19.0 websockets==12.0 python-dotenv==1.0.1 diff --git a/frontend/lib/utils.ts b/frontend/lib/utils.ts new file mode 100644 index 0000000..d084cca --- /dev/null +++ b/frontend/lib/utils.ts @@ -0,0 +1,6 @@ +import { type ClassValue, clsx } from "clsx" +import { twMerge } from "tailwind-merge" + +export function cn(...inputs: ClassValue[]) { + return twMerge(clsx(inputs)) +} -- 2.49.1