fixing bom

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 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 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 @@
 
 # # 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 . .
@@ -69,15 +155,26 @@
 
 # # Permissions
 # RUN chmod +x app.py
+
+
+# # -------------------------------------------------------------
+# # Entrypoint for handling corporate CA certs + app launch
+# # -------------------------------------------------------------
+# COPY entrypoint.sh /entrypoint.sh
+# RUN chmod +x /entrypoint.sh
+
+
+# # SWITCH TO USER
 # RUN chown -R 1000:1000 /app
 
 # # Expose Gradio port
 # EXPOSE 7860
 
-# # Run app
-# CMD ["python", "app.py"]
-
+# # Run app via entrypoint (this script will handle cert injection at runtime)
+# ENTRYPOINT ["/entrypoint.sh"]
 
+# # Default command
+# CMD ["python", "app.py"]
 
 
 
@@ -86,6 +183,8 @@
 # # -------------------------------------------------------------
 # FROM nvidia/cuda:12.3.2-devel-ubuntu22.04
 
+# USER root
+
 # # Non-interactive apt
 # ENV DEBIAN_FRONTEND=noninteractive
 # ENV PYTHONUNBUFFERED=1
@@ -153,120 +252,21 @@
 # # Create cache directory for downloaded repos
 # RUN mkdir -p /app/cache && chmod 777 /app/cache
 
-# # Permissions
+# # Permissions (optional, since we run as root)
 # RUN chmod +x app.py
 
-
 # # -------------------------------------------------------------
 # # Entrypoint for handling corporate CA certs + app launch
 # # -------------------------------------------------------------
 # COPY entrypoint.sh /entrypoint.sh
 # RUN chmod +x /entrypoint.sh
 
-
-# # SWITCH TO USER
-# RUN chown -R 1000:1000 /app
-
 # # Expose Gradio port
 # EXPOSE 7860
 
-# # Run app via entrypoint (this script will handle cert injection at runtime)
-# ENTRYPOINT ["/entrypoint.sh"]
+# # Run app via entrypoint (root user always)
+# ENTRYPOINT ["bash", "/entrypoint.sh"]
+
 
 # # Default command
 # CMD ["python", "app.py"]
-
-
-
-# -------------------------------------------------------------
-# Base image: NVIDIA CUDA (Ubuntu 22.04 jammy)
-# -------------------------------------------------------------
-FROM nvidia/cuda:12.3.2-devel-ubuntu22.04
-
-USER root
-
-# 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}
-
-# -------------------------------------------------------------
-# 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 \
-    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 & Hugging Face 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, 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
-# -------------------------------------------------------------
-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 (optional, since we run as root)
-RUN chmod +x app.py
-
-# -------------------------------------------------------------
-# 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 via entrypoint (root user always)
-ENTRYPOINT ["bash", "/entrypoint.sh"]
-
-
-# Default command
-CMD ["python", "app.py"]

app.py

@@ -101,6 +101,4 @@ def main():
 
 if __name__ == "__main__":
     main()
-    import socket
-    print("Server listening on:", socket.gethostbyname(socket.gethostname()), ":7860")
 

entrypoint.sh

@@ -1,53 +0,0 @@
-# #!/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
-
-
-#!/bin/bash
-set -e
-
-CERT_DIR=/data/certs
-mkdir -p "$CERT_DIR"
-
-if [ -n "$CORP_CERT1" ]; then
-    echo "$CORP_CERT1" | base64 -d > "$CERT_DIR/corp_cert1.crt"
-fi
-if [ -n "$CORP_CERT2" ]; then
-    echo "$CORP_CERT2" | base64 -d > "$CERT_DIR/corp_cert2.crt"
-fi
-if [ -n "$CORP_CERT3" ]; then
-    echo "$CORP_CERT3" | base64 -d > "$CERT_DIR/corp_cert3.crt"
-fi
-if [ -n "$CORP_CERT4" ]; then
-    echo "$CORP_CERT4" | base64 -d > "$CERT_DIR/corp_cert4.crt"
-fi
-
-cat "$CERT_DIR"/*.crt > "$CERT_DIR/corp_bundle.crt" 2>/dev/null || true
-export REQUESTS_CA_BUNDLE="$CERT_DIR/corp_bundle.crt"
-
-echo "✅ Corporate certs configured (if provided)."
-echo "🔗 REQUESTS_CA_BUNDLE set to $REQUESTS_CA_BUNDLE"
-
-exec "$@"
-
-
-

test.sh

@@ -1,6 +0,0 @@
-for f in *.sh; do
-  echo "Fixing $f"
-  sed -i '1s/^\xEF\xBB\xBF//' "$f"    # remove BOM if present
-  dos2unix "$f" 2>/dev/null || sed -i 's/\r$//' "$f"   # convert CRLF → LF
-  chmod +x "$f"                       # make executable
-done