Update Dockerfile

Optimizing loading

Dockerfile

@@ -1,56 +1,71 @@
-# Dockerfile Public T4
+# Use a smaller base image if possible, but maintain CUDA compatibility
+FROM nvidia/cuda:11.7.1-base-ubuntu22.04 AS base
+ENV DEBIAN_FRONTEND=noninteractive
 
-# https://gitlab.com/nvidia/container-images/cuda/-/blob/master/dist/11.7.1/ubuntu2204/devel/cudnn8/Dockerfile
-# FROM nvidia/cuda:11.7.1-cudnn8-devel-ubuntu22.04
-# https://gitlab.com/nvidia/container-images/cuda/-/blob/master/dist/11.7.1/ubuntu2204/base/Dockerfile
-FROM nvidia/cuda:11.7.1-base-ubuntu22.04
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get update -y && apt-get upgrade -y && apt-get install -y libgl1 libglib2.0-0 wget git git-lfs python3-pip python-is-python3 && rm -rf /var/lib/apt/lists/*
-
-RUN adduser --disabled-password --gecos '' user
-RUN mkdir /content && chown -R user:user /content
+# Create user and directories early to leverage caching
+RUN adduser --disabled-password --gecos '' user && \
+    mkdir -p /content/stable-diffusion-webui/models/Stable-diffusion && \
+    chown -R user:user /content
 WORKDIR /content
 USER user
 
-RUN pip3 install --upgrade pip
-RUN pip install torchmetrics==0.11.4
-RUN pip install https://github.com/camenduru/stable-diffusion-webui-colab/releases/download/0.0.16/xformers-0.0.16+814314d.d20230118-cp310-cp310-linux_x86_64.whl
-RUN pip install --pre triton
-RUN pip install numexpr
-RUN pip install httpx==0.24.1
+# Pre-download model in a separate stage for better caching
+FROM base AS model-downloader
+ADD https://huggingface.co/darkstorm2150/OpenGen/resolve/main/OpenGen%20v1.0.safetensors /tmp/model.safetensors
+USER root
+RUN mv /tmp/model.safetensors /content/stable-diffusion-webui/models/Stable-diffusion/
+USER user
 
-RUN git clone -b v1.6 https://github.com/camenduru/stable-diffusion-webui
-RUN pip install pip==23.3.1  # Downgrade pip to fix metadata issue
-RUN pip install pytorch_lightning==1.7.6
-RUN sed -i '$a fastapi==0.90.0' /content/stable-diffusion-webui/requirements_versions.txt
-RUN sed -i -e '''/prepare_environment()/a\    os.system\(f\"""sed -i -e ''\"s/dict()))/dict())).cuda()/g\"'' /content/stable-diffusion-webui/repositories/stable-diffusion-stability-ai/ldm/util.py""")''' /content/stable-diffusion-webui/launch.py
-RUN sed -i -e 's/    start()/    #start()/g' /content/stable-diffusion-webui/launch.py
-RUN cd stable-diffusion-webui && python launch.py --skip-torch-cuda-test
+# Main build stage with optimized layers
+FROM base AS final
+COPY --from=model-downloader /content/stable-diffusion-webui/models/Stable-diffusion/OpenGen%20v1.0.safetensors /content/stable-diffusion-webui/models/Stable-diffusion/
 
-ADD --chown=user https://github.com/camenduru/webui-docker/raw/main/env_patch.py /content/env_patch.py
-RUN sed -i -e '/import image_from_url_text/r /content/env_patch.py' /content/stable-diffusion-webui/modules/ui.py
-ADD --chown=user https://raw.githubusercontent.com/darkstorm2150/webui/main/header_patch.py /content/header_patch.py
-RUN sed -i -e '/demo:/r /content/header_patch.py' /content/stable-diffusion-webui/modules/ui.py
+# Install system dependencies efficiently
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+    libgl1 libglib2.0-0 wget git git-lfs python3-pip python-is-python3 && \
+    rm -rf /var/lib/apt/lists/*
 
-RUN sed -i -e '/(modelmerger_interface, \"Checkpoint Merger\", \"modelmerger\"),/d' /content/stable-diffusion-webui/modules/ui.py
-RUN sed -i -e '/(train_interface, \"Train\", \"ti\"),/d' /content/stable-diffusion-webui/modules/ui.py
-RUN sed -i -e '/extensions_interface, \"Extensions\", \"extensions\"/d' /content/stable-diffusion-webui/modules/ui.py
-RUN sed -i -e '/settings_interface, \"Settings\", \"settings\"/d' /content/stable-diffusion-webui/modules/ui.py
-RUN sed -i -e "s/document.getElementsByTagName('gradio-app')\[0\].shadowRoot/!!document.getElementsByTagName('gradio-app')[0].shadowRoot ? document.getElementsByTagName('gradio-app')[0].shadowRoot : document/g" /content/stable-diffusion-webui/script.js
-RUN sed -i -e 's/                show_progress=False,/                show_progress=True,/g' /content/stable-diffusion-webui/modules/ui.py
-RUN sed -i -e 's/default_enabled=False/default_enabled=True/g' /content/stable-diffusion-webui/webui.py
-RUN sed -i -e 's/ outputs=\[/queue=False, &/g' /content/stable-diffusion-webui/modules/ui.py
-RUN sed -i -e 's/               queue=False,  /                /g' /content/stable-diffusion-webui/modules/ui.py
+# Combine pip installations into a single layer
+RUN pip3 install --upgrade pip==23.3.1 && \
+    pip install --no-cache-dir \
+    torchmetrics==0.11.4 \
+    numexpr \
+    httpx==0.24.1 \
+    pytorch_lightning==1.7.6 \
+    https://github.com/camenduru/stable-diffusion-webui-colab/releases/download/0.0.16/xformers-0.0.16+814314d.d20230118-cp310-cp310-linux_x86_64.whl \
+    --pre triton
 
-RUN rm -rfv /content/stable-diffusion-webui/scripts/
+# Clone repository and apply patches in a single step
+RUN git clone -b v1.6 https://github.com/camenduru/stable-diffusion-webui && \
+    cd stable-diffusion-webui && \
+    sed -i 's/dict()))/dict())).cuda()/g' repositories/stable-diffusion-stability-ai/ldm/util.py && \
+    sed -i '/prepare_environment()/a os.system("sed -i -e '\''s/dict()))/dict())).cuda()/g'\'' repositories/stable-diffusion-stability-ai/ldm/util.py")' launch.py && \
+    sed -i 's/start()/#start()/g' launch.py && \
+    echo "fastapi==0.90.0" >> requirements_versions.txt && \
+    python launch.py --skip-torch-cuda-test
 
-ADD --chown=user https://github.com/camenduru/webui-docker/raw/main/shared-config.json /content/shared-config.json
-ADD --chown=user https://github.com/camenduru/webui-docker/raw/main/shared-ui-config.json /content/shared-ui-config.json
+# Apply configuration patches
+ADD --chown=user https://github.com/camenduru/webui-docker/raw/main/env_patch.py /content/
+ADD --chown=user https://raw.githubusercontent.com/darkstorm2150/webui/main/header_patch.py /content/
+RUN sed -i '/import image_from_url_text/r /content/env_patch.py' stable-diffusion-webui/modules/ui.py && \
+    sed -i '/demo:/r /content/header_patch.py' stable-diffusion-webui/modules/ui.py
 
+# Cleanup and optimizations
+RUN rm -rf stable-diffusion-webui/scripts && \
+    sed -i -e '/(modelmerger_interface, "Checkpoint Merger", "modelmerger"),/d' \
+          -e '/(train_interface, "Train", "ti"),/d' \
+          -e '/extensions_interface, "Extensions", "extensions"/d' \
+          -e '/settings_interface, "Settings", "settings"/d' \
+          -e 's/document.getElementsByTagName.*shadowRoot/!!& ? & : document/g' stable-diffusion-webui/script.js && \
+    sed -i 's/show_progress=False/show_progress=True/g' stable-diffusion-webui/modules/ui.py && \
+    sed -i 's/default_enabled=False/default_enabled=True/g' stable-diffusion-webui/webui.py && \
+    sed -i 's/ outputs=\[/queue=False, &/g' stable-diffusion-webui/modules/ui.py && \
+    sed -i 's/queue=False,  //g' stable-diffusion-webui/modules/ui.py
 
-ADD --chown=user https://huggingface.co/darkstorm2150/OpenGen/resolve/main/OpenGen%20v1.0.safetensors /content/stable-diffusion-webui/models/Stable-diffusion/OpenGen%20v1.0.safetensors
+# Add configuration files
+ADD --chown=user https://github.com/camenduru/webui-docker/raw/main/shared-config.json /content/
+ADD --chown=user https://github.com/camenduru/webui-docker/raw/main/shared-ui-config.json /content/
 
 EXPOSE 7860
-
-CMD cd /content/stable-diffusion-webui && python webui.py --xformers --listen --disable-console-progressbars --enable-console-prompts --no-progressbar-hiding --ui-config-file /content/shared-ui-config.json --ui-settings-file /content/shared-config.json
+CMD ["python", "webui.py", "--xformers", "--listen", "--disable-console-progressbars", "--enable-console-prompts", "--no-progressbar-hiding", "--ui-config-file", "/content/shared-ui-config.json", "--ui-settings-file", "/content/shared-config.json"]