updating Dockerfile

Dockerfile

@@ -1,73 +1,85 @@
-FROM python:3.8-slim
+# Stage 1: Build detectron2
+FROM python:3.8-slim as builder
 
-# Install system dependencies
 RUN apt-get update && apt-get install -y \
     git \
     build-essential \
     cmake \
+    ninja-build \
     python3-dev \
+    gcc-8 \
+    g++-8 \
+    && rm -rf /var/lib/apt/lists/*
+
+# Set gcc-8 as default
+RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 800 --slave /usr/bin/g++ g++ /usr/bin/g++-8
+
+# Install build dependencies
+RUN pip install --upgrade "pip<24.1" setuptools wheel
+RUN pip install torch==1.13.1+cpu torchvision==0.14.1+cpu -f https://download.pytorch.org/whl/torch_stable.html
+RUN pip install numpy==1.21.6 cython pycocotools
+
+# Build detectron2 wheel
+WORKDIR /tmp
+RUN git clone https://github.com/facebookresearch/detectron2.git && \
+    cd detectron2 && \
+    git checkout v0.6 && \
+    python setup.py bdist_wheel && \
+    cp dist/*.whl /wheels/ || mkdir -p /wheels && \
+    pip wheel . --wheel-dir=/wheels
+
+# Stage 2: Runtime image
+FROM python:3.8-slim
+
+# Install runtime dependencies only
+RUN apt-get update && apt-get install -y \
     libglib2.0-0 \
     libsm6 \
     libxext6 \
     libxrender-dev \
     libgomp1 \
     libgl1-mesa-glx \
-    wget \
-    curl \
-    ninja-build \
-    gcc-8 \
-    g++-8 \
+    libgcc-s1 \
     && rm -rf /var/lib/apt/lists/*
 
-# Set gcc-8 as default (better compatibility with detectron2)
-RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 800 --slave /usr/bin/g++ g++ /usr/bin/g++-8
-
 # Create user
 RUN useradd -m -u 1000 user
 
 WORKDIR /app
 
-# Upgrade pip to a compatible version
+# Install Python packages
 RUN pip install --upgrade "pip<24.1" setuptools wheel
 
-# Install PyTorch for Python 3.8
+# Install PyTorch
 RUN pip install torch==1.13.1+cpu torchvision==0.14.1+cpu -f https://download.pytorch.org/whl/torch_stable.html
 
-# Install compatible numpy and pillow
-RUN pip install numpy==1.21.6 pillow==9.5.0
-
-# Install detectron2 dependencies
+# Install core dependencies
 RUN pip install \
-    cython \
+    numpy==1.21.6 \
+    pillow==9.5.0 \
     pycocotools \
     opencv-python==4.5.5.64 \
     scipy==1.7.3 \
-    matplotlib==3.5.3 \
-    cloudpickle \
-    tabulate \
-    tensorboard \
-    yacs \
-    termcolor \
-    future \
-    fvcore \
-    iopath==0.1.9 \
-    omegaconf==2.1.2 \
-    hydra-core==1.1.2
+    matplotlib==3.5.3
 
-# Install detectron2 from source with Python 3.8 compatibility
-RUN git clone https://github.com/facebookresearch/detectron2.git && \
-    cd detectron2 && \
-    git checkout v0.6 && \
-    python -m pip install -e . && \
-    cd ..
+# Copy and install detectron2 wheel from builder
+COPY --from=builder /wheels/detectron2*.whl /tmp/
+RUN pip install /tmp/detectron2*.whl && rm -f /tmp/detectron2*.whl
 
-# Install additional dependencies
+# Install remaining dependencies
 RUN pip install \
     scikit-learn==1.0.2 \
     scikit-image==0.19.3 \
     gradio==3.35.2 \
     huggingface_hub==0.15.1 \
-    tqdm
+    tqdm \
+    iopath==0.1.9 \
+    omegaconf==2.1.2 \
+    hydra-core==1.1.2 \
+    tabulate \
+    tensorboard \
+    yacs \
+    termcolor
 
 # Switch to user
 USER user
@@ -76,7 +88,7 @@ ENV HOME=/home/user PATH=/home/user/.local/bin:$PATH
 # Copy application
 COPY --chown=user:user . /app
 
-# Install additional requirements
+# Install user requirements
 COPY --chown=user:user requirements.txt /app/requirements.txt
 RUN pip install --user --no-deps -r /app/requirements.txt || true
 
@@ -86,8 +98,5 @@ ENV FORCE_CUDA="0"
 ENV TORCH_CUDA_ARCH_LIST=""
 ENV PYTHONUNBUFFERED=1
 
-# Create necessary directories
-RUN mkdir -p /home/user/.cache
-
 EXPOSE 7860
 CMD ["python", "app.py"]

requirements.txt

@@ -1,19 +1,24 @@
-# Core dependencies (torch and detectron2 installed in Dockerfile)
-# Git dependencies
-git+https://github.com/cocodataset/panopticapi.git
-git+https://github.com/mcordts/cityscapesScripts.git
+# Git dependencies compatible with Python 3.8
+git+https://github.com/cocodataset/panopticapi.git@7bb4655
+git+https://github.com/mcordts/cityscapesScripts.git@4f57ab6
 
-# Additional dependencies
-imutils
-cython
-h5py
+# Core dependencies with Python 3.8 compatible versions
+imutils==0.5.4
+cython==0.29.35
+h5py==3.7.0
 timm==0.4.12
-einops
-gdown
-wget
-submitit
-shapely
-regex
-ftfy
-inflect
-diffdist
+einops==0.6.1
+gdown==4.5.4
+wget==3.2
+submitit==1.4.5
+shapely==1.8.5
+regex==2022.10.31
+ftfy==6.1.1
+inflect==6.0.4
+
+# Don't install these - handled in Dockerfile
+# torch
+# torchvision
+# detectron2
+# numpy
+# pillow