إعادة ترتيب Dockerfile: تثبيت numpy قبل f2py

Dockerfile

@@ -1,95 +1,83 @@
-# TSU-WAVE Dockerfile
-# Multi-stage build for optimized production image
+# Dockerfile كامل ومحسّن لمشروع TSU-WAVE
 
-# ========== STAGE 1: Builder ==========
-FROM python:3.10-slim as builder
-
-WORKDIR /build
+# ===== مرحلة بناء Fortran =====
+FROM python:3.10-slim as fortran-builder
 
-# Install build dependencies
+# تثبيت متطلبات بناء Fortran
 RUN apt-get update && apt-get install -y --no-install-recommends \
     gfortran \
     liblapack-dev \
-    gcc \
     && rm -rf /var/lib/apt/lists/*
 
-# Copy requirements
-COPY requirements.txt .
-COPY requirements-dev.txt .
-
-# Create virtual environment and install dependencies
-RUN python -m venv /venv
-ENV PATH="/venv/bin:$PATH"
+WORKDIR /fortran-build
 
-RUN pip install --upgrade pip && \
-    pip install --no-cache-dir wheel && \
-    pip install --no-cache-dir -r requirements.txt && \
-    pip install --no-cache-dir numpy && \
-    if [ -f requirements-dev.txt ]; then pip install --no-cache-dir -r requirements-dev.txt; fi
+# نسخ ملف Fortran
+COPY src/core/nswe_solver.f90 .
 
-# ========== STAGE 2: Fortran Compiler ==========
-FROM python:3.10-slim as fortran-builder
+# تثبيت numpy واستخدام f2py لبناء مكتبة Fortran
+RUN pip install --no-cache-dir numpy && \
+    python -c "import numpy; import numpy.f2py; numpy.f2py.main()" -c nswe_solver.f90 -m nswe_solver
 
-WORKDIR /fortran-build
+# ===== مرحلة بناء Python =====
+FROM python:3.10-slim as builder
 
-# Install Fortran compiler
+# تثبيت أدوات النظام اللازمة
 RUN apt-get update && apt-get install -y --no-install-recommends \
     gfortran \
     liblapack-dev \
+    gcc \
     && rm -rf /var/lib/apt/lists/*
 
-# Copy source and compile NSWE solver
-COPY src/core/nswe_solver.f90 .
-RUN python -c "import numpy; import numpy.f2py; numpy.f2py.main()" -c nswe_solver.f90 -m nswe_solver
+WORKDIR /build
 
-# ========== STAGE 3: Final Image ==========
+# نسخ ملفات المتطلبات
+COPY requirements.txt .
+COPY requirements-dev.txt .
+
+# إنشاء بيئة افتراضية وتثبيت الحزم
+RUN python -m venv /venv && \
+    /venv/bin/pip install --upgrade pip && \
+    /venv/bin/pip install --no-cache-dir wheel && \
+    /venv/bin/pip install --no-cache-dir -r requirements.txt && \
+    /venv/bin/pip install --no-cache-dir numpy && \
+    if [ -f requirements-dev.txt ]; then /venv/bin/pip install --no-cache-dir -r requirements-dev.txt; fi
+
+# ===== المرحلة النهائية =====
 FROM python:3.10-slim
 
-# Create tsu-wave user
+# إنشاء مستخدم غير جذري
 RUN useradd --create-home --shell /bin/bash tsuwave
 
-# Install runtime dependencies
+# تثبيت مكتبات التشغيل اللازمة
 RUN apt-get update && apt-get install -y --no-install-recommends \
     liblapack3 \
     libgfortran5 \
     curl \
     && rm -rf /var/lib/apt/lists/*
 
-# Create directories
-WORKDIR /app
-
-# Copy virtual environment from builder
+# نسخ البيئة الافتراضية من مرحلة builder
 COPY --from=builder --chown=tsuwave:tsuwave /venv /venv
-ENV PATH="/venv/bin:$PATH"
 
-# Copy compiled Fortran module
+# نسخ مكتبة Fortran المبنية
 COPY --from=fortran-builder --chown=tsuwave:tsuwave /fortran-build/nswe_solver.*.so /app/src/tsuwave/core/
 
-# Copy application code
+# تعيين متغيرات البيئة
+ENV PATH="/venv/bin:$PATH" \
+    PYTHONUNBUFFERED=1
+
+# نسخ ملفات المشروع
+WORKDIR /app
 COPY --chown=tsuwave:tsuwave . .
 
-# Create necessary directories with proper permissions
+# إنشاء المجلدات اللازمة
 RUN mkdir -p /app/data /app/logs /app/config && \
     chown -R tsuwave:tsuwave /app
 
-# Switch to non-root user
+# التبديل إلى المستخدم غير الجذري
 USER tsuwave
 
-# Expose ports
-EXPOSE 8000 8080
-
-# Health check
-HEALTHCHECK --interval=30s --timeout=10s --start-period=60s --retries=3 \
-    CMD curl -f http://localhost:8000/health || exit 1
-
-# Set environment variables
-ENV PYTHONPATH=/app/src
-ENV TSUWAVE_ENV=production
-ENV TSUWAVE_CONFIG=/app/config/config.yml
-
-# Default command
-CMD ["uvicorn", "tsuwave.api.main:app", "--host", "0.0.0.0", "--port", "8000", "--workers", "4"]
+# تشغيل التطبيق (يجمع بين FastAPI و Streamlit)
+CMD ["sh", "-c", "uvicorn tsuwave.api.main:app --host 0.0.0.0 --port 7860 & streamlit run src/tsuwave/dashboard/app.py --server.port 8501 --server.address 0.0.0.0"]
 
-# Alternative commands:
-# CMD ["streamlit", "run", "src/tsuwave/dashboard/app.py", "--server.port=8080", "--server.address=0.0.0.0"]
-# CMD ["python", "src/main.py"]
+# المنفذ الذي سيستخدمه التطبيق
+EXPOSE 7860 8501