Update Dockerfile

Dockerfile

@@ -1,51 +1,125 @@
 
-# Dockerfile Public Nightly A10G
+FROM nvidia/cuda:11.7.1-cudnn8-devel-ubuntu22.04
 
-# https://gitlab.com/nvidia/container-images/cuda/-/blob/master/dist/11.7.1/ubuntu2204/devel/cudnn8/Dockerfile
-FROM nvidia/cuda:11.7.1-base-ubuntu22.04
 ENV DEBIAN_FRONTEND noninteractive
+ENV PYTHONUNBUFFERED=1
+ENV PIP_DISABLE_PIP_VERSION_CHECK=1
+ENV PIP_NO_CACHE_DIR=1
 
+# OS setup
+RUN apt-get update -y \
+    && apt-get upgrade -y \
+    && apt-get install -y \
+        libgl1 \
+        libglib2.0-0 \
+        curl \
+        vim \
+        wget \
+        git \
+        git-lfs \
+        tzdata \
+        bash \
+        ca-certificates \
+        libreadline8 \
+        bzip2 \
+        psmisc \
+        procps \
+        netbase \
+        openssh-client \
+        libsqlite3-dev \
+        python3-pip \
+        python3-venv \
+        python-is-python3 \
+        build-essential \
+        libssl-dev \
+        libffi-dev \
+        aria2 \
+    \
+    && pip3 install --upgrade pip \
+    \
+    && git lfs install \
+    \
+    && apt-get clean autoclean \
+    && apt-get autoremove --yes \
+    && rm -rf /var/lib/apt/lists/*
 
-WORKDIR /content
+# OS timezone setting (UTC)
+RUN echo "UTC" > /etc/timezone
+ENV TZ=UTC
 
-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 && pip3 install --upgrade pip
-RUN pip install xformers==0.0.27
-RUN pip install --pre triton
-RUN pip install numexpr
+# Poetry for Python packages
+RUN curl -sSL https://install.python-poetry.org | POETRY_HOME=/usr/local/poetry python3 - --yes \
+    && ln -s /usr/local/poetry/bin/poetry /usr/bin/poetry \
+    \
+    && poetry config virtualenvs.create false \
+    && poetry config virtualenvs.in-project false
 
-RUN git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui
-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
+# Create non-root user
+ENV ENV="/etc/profile"
+RUN adduser --disabled-password --gecos '' user && \
+    mkdir -p /app && \
+    chown -R user:user /app && \
+    printf "\n. /etc/profile\n" >> /home/user/.profile \
+    printf "\n. /etc/profile\n" >> /home/user/.bashrc
 
-ADD 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 https://github.com/camenduru/webui-docker/raw/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
+# Sets up virtualenv for dependencies
+ENV VIRTUAL_ENV="/opt/venv"
+ENV VIRTUAL_ENV_DISABLE_PROMPT=1
+ENV POETRY_ACTIVE=1
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+RUN echo "export PATH=$PATH" >> /home/user/.bashrc \
+    && python3 -m venv $VIRTUAL_ENV \
+    && /opt/venv/bin/pip install --upgrade --no-cache-dir pip \
+    && chown -R user:user /opt/venv
 
-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
+# Run as non-root user
+USER user
+WORKDIR /app
 
-RUN rm -rfv /content/stable-diffusion-webui/scripts/
+# Installation of basic Python dependencies specified in pyproject.toml
+COPY --chown=user:user pyproject.toml poetry.lock /app/
+RUN poetry install
 
-ADD https://github.com/camenduru/webui-docker/raw/main/shared-config.json /content/shared-config.json
-ADD https://github.com/camenduru/webui-docker/raw/main/shared-ui-config.json /content/shared-ui-config.json
+# AUTOMATIC1111' WebUI
+RUN git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui /app/stable-diffusion-webui \
+    && (cd /app/stable-diffusion-webui && git checkout a9fed7c364061ae6efb37f797b6b522cb3cf7aa2)
 
-ADD https://huggingface.co/andite/anything-v4.0/resolve/main/anything-v4.5-pruned.ckpt /content/stable-diffusion-webui/models/Stable-diffusion/anything-v4.5-pruned.ckpt
-ADD https://huggingface.co/andite/anything-v4.0/resolve/main/anything-v4.0.vae.pt /content/stable-diffusion-webui/models/Stable-diffusion/anything-v4.5-pruned.vae.pt
+# Deforum extension
+RUN git clone https://github.com/deforum-art/deforum-for-automatic1111-webui /app/stable-diffusion-webui/extensions/deforum-for-automatic1111-webui \
+    && (cd /app/stable-diffusion-webui/extensions/deforum-for-automatic1111-webui && git checkout 2366bfdb47c226df0d14e712445414e459febad3)
 
-RUN adduser --disabled-password --gecos '' user
-RUN chown -R user:user /content
-RUN chmod -R 777 /content
-USER user
+# Images Browser WebUI extension
+RUN git clone https://github.com/yfszzx/stable-diffusion-webui-images-browser /app/stable-diffusion-webui/extensions/stable-diffusion-webui-images-browser \
+    && (cd /app/stable-diffusion-webui/extensions/stable-diffusion-webui-images-browser && git checkout a42c7a30181636a05815e62426d5eff4d3340529)
+
+# CiviTAI Browser WebUI extension
+RUN git clone https://github.com/Vetchems/sd-civitai-browser /app/stable-diffusion-webui/extensions/sd-civitai-browser \
+    && (cd /app/stable-diffusion-webui/extensions/sd-civitai-browser && git checkout b25a5daf7df3f6340d3e243d533228d8ade5288d)
+
+# Additional Networks WebUI extension
+RUN git clone https://github.com/kohya-ss/sd-webui-additional-networks /app/stable-diffusion-webui/extensions/sd-webui-additional-networks \
+    && (cd /app/stable-diffusion-webui/extensions/sd-webui-additional-networks && git checkout d2758b6c8e2e8e956865a87b31fd74d3d7c010cb) \
+    && mkdir -p /app/stable-diffusion-webui/extensions/sd-webui-additional-networks/models/LoRA
+
+# ControlNet WebUI extension
+RUN git clone https://github.com/Mikubill/sd-webui-controlnet /app/stable-diffusion-webui/extensions/sd-webui-controlnet \
+    && (cd /app/stable-diffusion-webui/extensions/sd-webui-controlnet && git checkout 274dd5df217a03e059e9cf052447aece81bbd1cf) \
+    && mkdir -p /app/stable-diffusion-webui/models/ControlNet
+
+# Prepare WebUI environment
+WORKDIR /app/stable-diffusion-webui
+RUN /opt/venv/bin/python launch.py --exit --skip-torch-cuda-test --xformers
+
+# Patch WebUI
+RUN sed -i -e 's/                show_progress=False,/                show_progress=True,/g' modules/ui.py
+RUN sed -i -e 's/shared.demo.launch/shared.demo.queue().launch/g' webui.py
+RUN sed -i -e 's/ outputs=\[/queue=False, &/g' modules/ui.py
+RUN sed -i -e 's/               queue=False,  /                /g' modules/ui.py
+
+# Copy startup scripts
+COPY --chown=user:user run.py on_start.sh config.json ui-config.json shared-config.json shared-ui-config.json header_patch.py /app/stable-diffusion-webui/
+RUN chmod +x on_start.sh
 
 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 ["/opt/venv/bin/python", "run.py", "--listen", "--ui-config-file", "ui-config.json", "--ui-settings-file", "config.json", "--disable-console-progressbars", "--cors-allow-origins", "huggingface.co,hf.space", "--no-progressbar-hiding", "--enable-console-prompts", "--no-download-sd-model", "--api", "--skip-version-check"]