added certi

Dockerfile

@@ -1,5 +1,89 @@
 
-# Use NVIDIA CUDA base image (Ubuntu 22.04 jammy)
+# # Use NVIDIA CUDA base image (Ubuntu 22.04 jammy)
+# FROM nvidia/cuda:12.3.2-devel-ubuntu22.04
+
+# # Non-interactive apt
+# ENV DEBIAN_FRONTEND=noninteractive
+# ENV PYTHONUNBUFFERED=1
+# ENV CUDA_HOME=/usr/local/cuda
+# ENV PATH=${CUDA_HOME}/bin:/usr/local/bin:${PATH}
+# ENV LD_LIBRARY_PATH=${CUDA_HOME}/lib64:${LD_LIBRARY_PATH}
+
+# # Proxy (auto-configurable: overridden at runtime if needed)
+# # ENV http_proxy=""
+# # ENV https_proxy=""
+# # ENV HTTP_PROXY=""
+# # ENV HTTPS_PROXY=""
+
+# # System deps + Deadsnakes PPA for Python 3.12
+# RUN apt-get update && apt-get install -y --no-install-recommends \
+#     software-properties-common \
+#     ca-certificates \
+#     curl wget git build-essential \
+#     libgl1-mesa-glx libglib2.0-0 libsm6 libxext6 libxrender1 \
+#     libgomp1 libgcc-s1 \
+#  && add-apt-repository ppa:deadsnakes/ppa -y \
+#  && apt-get update && apt-get install -y --no-install-recommends \
+#     python3.12 python3.12-dev python3.12-venv \
+#  && rm -rf /var/lib/apt/lists/*
+
+# # Install pip for Python 3.12
+# RUN curl -sS https://bootstrap.pypa.io/get-pip.py -o /tmp/get-pip.py \
+#  && python3.12 /tmp/get-pip.py \
+#  && rm /tmp/get-pip.py
+
+# # Make 'python' and 'pip' point to 3.12
+# RUN ln -sf /usr/bin/python3.12 /usr/bin/python && \
+#     ln -sf /usr/local/bin/pip3.12 /usr/local/bin/pip
+
+# # ---------------- Writable app data & HF cache ----------------
+# ENV APP_DATA_DIR=/data
+# ENV HF_HOME=/data/hf_home
+# ENV HUGGINGFACE_HUB_CACHE=/data/hf_home
+# ENV TRANSFORMERS_CACHE=/data/hf_home
+# ENV MPLCONFIGDIR=/data/matplotlib   
+
+# RUN mkdir -p /data/geometry /data/solution /data/weights /data/hf_home /data/matplotlib \
+#  && chmod -R 777 /data
+
+# # ---------------- Install frpc for Gradio share=True ----------------
+# RUN mkdir -p /data/hf_home/gradio/frpc && \
+#     wget https://cdn-media.huggingface.co/frpc-gradio-0.3/frpc_linux_amd64 -O /data/hf_home/gradio/frpc/frpc_linux_amd64_v0.3 && \
+#     chmod +x /data/hf_home/gradio/frpc/frpc_linux_amd64_v0.3
+
+# # ---------------- Application setup ----------------
+# WORKDIR /app
+
+# # Copy requirements first (better caching)
+# COPY requirements.txt .
+
+# # Install Python deps
+# RUN pip install --no-cache-dir --upgrade pip setuptools wheel \
+#  && pip install --no-cache-dir -r requirements.txt
+
+# # Copy the rest of the source
+# COPY . .
+
+# # Create cache directory for downloaded repos
+# RUN mkdir -p /app/cache && chmod 777 /app/cache
+
+# # Permissions
+# RUN chmod +x app.py
+# RUN chown -R 1000:1000 /app
+
+# # Expose Gradio port
+# EXPOSE 7860
+
+# # Run app
+# CMD ["python", "app.py"]
+
+
+
+
+
+# -------------------------------------------------------------
+# Base image: NVIDIA CUDA (Ubuntu 22.04 jammy)
+# -------------------------------------------------------------
 FROM nvidia/cuda:12.3.2-devel-ubuntu22.04
 
 # Non-interactive apt
@@ -9,34 +93,32 @@ ENV CUDA_HOME=/usr/local/cuda
 ENV PATH=${CUDA_HOME}/bin:/usr/local/bin:${PATH}
 ENV LD_LIBRARY_PATH=${CUDA_HOME}/lib64:${LD_LIBRARY_PATH}
 
-# Proxy (auto-configurable: overridden at runtime if needed)
-# ENV http_proxy=""
-# ENV https_proxy=""
-# ENV HTTP_PROXY=""
-# ENV HTTPS_PROXY=""
-
-# System deps + Deadsnakes PPA for Python 3.12
+# -------------------------------------------------------------
+# System dependencies + Python 3.12
+# -------------------------------------------------------------
 RUN apt-get update && apt-get install -y --no-install-recommends \
     software-properties-common \
     ca-certificates \
     curl wget git build-essential \
     libgl1-mesa-glx libglib2.0-0 libsm6 libxext6 libxrender1 \
     libgomp1 libgcc-s1 \
- && add-apt-repository ppa:deadsnakes/ppa -y \
- && apt-get update && apt-get install -y --no-install-recommends \
+    && add-apt-repository ppa:deadsnakes/ppa -y \
+    && apt-get update && apt-get install -y --no-install-recommends \
     python3.12 python3.12-dev python3.12-venv \
- && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/*
 
 # Install pip for Python 3.12
 RUN curl -sS https://bootstrap.pypa.io/get-pip.py -o /tmp/get-pip.py \
- && python3.12 /tmp/get-pip.py \
- && rm /tmp/get-pip.py
+    && python3.12 /tmp/get-pip.py \
+    && rm /tmp/get-pip.py
 
 # Make 'python' and 'pip' point to 3.12
 RUN ln -sf /usr/bin/python3.12 /usr/bin/python && \
     ln -sf /usr/local/bin/pip3.12 /usr/local/bin/pip
 
-# ---------------- Writable app data & HF cache ----------------
+# -------------------------------------------------------------
+# Writable app data & Hugging Face cache
+# -------------------------------------------------------------
 ENV APP_DATA_DIR=/data
 ENV HF_HOME=/data/hf_home
 ENV HUGGINGFACE_HUB_CACHE=/data/hf_home
@@ -44,14 +126,18 @@ ENV TRANSFORMERS_CACHE=/data/hf_home
 ENV MPLCONFIGDIR=/data/matplotlib   
 
 RUN mkdir -p /data/geometry /data/solution /data/weights /data/hf_home /data/matplotlib \
- && chmod -R 777 /data
+    && chmod -R 777 /data
 
-# ---------------- Install frpc for Gradio share=True ----------------
+# -------------------------------------------------------------
+# Install frpc (for Gradio share=True, though share=False is default)
+# -------------------------------------------------------------
 RUN mkdir -p /data/hf_home/gradio/frpc && \
     wget https://cdn-media.huggingface.co/frpc-gradio-0.3/frpc_linux_amd64 -O /data/hf_home/gradio/frpc/frpc_linux_amd64_v0.3 && \
     chmod +x /data/hf_home/gradio/frpc/frpc_linux_amd64_v0.3
 
-# ---------------- Application setup ----------------
+# -------------------------------------------------------------
+# Application setup
+# -------------------------------------------------------------
 WORKDIR /app
 
 # Copy requirements first (better caching)
@@ -59,7 +145,7 @@ COPY requirements.txt .
 
 # Install Python deps
 RUN pip install --no-cache-dir --upgrade pip setuptools wheel \
- && pip install --no-cache-dir -r requirements.txt
+    && pip install --no-cache-dir -r requirements.txt
 
 # Copy the rest of the source
 COPY . .
@@ -71,8 +157,17 @@ RUN mkdir -p /app/cache && chmod 777 /app/cache
 RUN chmod +x app.py
 RUN chown -R 1000:1000 /app
 
+# -------------------------------------------------------------
+# Entrypoint for handling corporate CA certs + app launch
+# -------------------------------------------------------------
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
 # Expose Gradio port
 EXPOSE 7860
 
-# Run app
+# Run app via entrypoint (this script will handle cert injection at runtime)
+ENTRYPOINT ["/entrypoint.sh"]
+
+# Default command
 CMD ["python", "app.py"]

entrypoint.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+set -e
+
+# If secrets exist, decode them
+if [ -n "$CORP_CERT1" ]; then
+    echo "$CORP_CERT1" | base64 -d > /usr/local/share/ca-certificates/corp_cert1.crt
+fi
+if [ -n "$CORP_CERT2" ]; then
+    echo "$CORP_CERT2" | base64 -d > /usr/local/share/ca-certificates/corp_cert2.crt
+fi
+if [ -n "$CORP_CERT3" ]; then
+    echo "$CORP_CERT3" | base64 -d > /usr/local/share/ca-certificates/corp_cert3.crt
+fi
+if [ -n "$CORP_CERT4" ]; then
+    echo "$CORP_CERT4" | base64 -d > /usr/local/share/ca-certificates/corp_cert4.crt
+fi
+
+# Update CA store if any certs were added
+update-ca-certificates || true
+
+# Finally run your app
+exec python app.py