installation

Dockerfile

@@ -66,6 +66,11 @@ RUN echo "export PATH=$PATH" >> ~/.bashrc \
     && python3 -m venv $VIRTUAL_ENV \
     && /opt/venv/bin/pip install --upgrade --no-cache-dir pip
 
+# Run app as non-root user
+RUN adduser --disabled-password --gecos '' user
+RUN chown -R user:user /app /opt/venv
+USER user
+
 # Installation of basic Python dependencies specified in pyproject.toml
 WORKDIR /app
 COPY pyproject.toml poetry.lock /app/
@@ -97,11 +102,6 @@ RUN sed -i -e 's/               queue=False,  /                /g' modules/ui.py
 COPY run.py on_start.sh /app/stable-diffusion-webui/
 RUN chmod +x on_start.sh
 
-# Run app as non-root user
-RUN adduser --disabled-password --gecos '' user
-RUN chown -R user:user /app
-USER user
-
 EXPOSE 7860
 
 CMD ["/opt/venv/bin/python", "run.py", "--force-enable-xformers", "--xformers", "--listen", "--enable-insecure-extension-access", "--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"]

on_start.sh

@@ -1,6 +1,18 @@
 #!/bin/bash
 set -euo pipefail
 
+# echo "\$ nvidia smi"
+# nvidia-smi
+#
+# # Install xformers matching the GPU (only for Nvidia A10G and T4 GPUs)
+# if nvidia-smi --query-gpu=gpu_name --format=csv,noheader | grep -q A10G; then
+#     /opt/venv/bin/pip install https://github.com/camenduru/stable-diffusion-webui-colab/releases/download/0.0.16/xformers-0.0.16+814314d.d20230119.A10G-cp310-cp310-linux_x86_64.whl
+# elif nvidia-smi --query-gpu=gpu_name --format=csv,noheader | grep -q T4; then
+#     /opt/venv/bin/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
+# else
+#     /opt/venv/bin/pip install --pre xformers
+# fi
+
 # SD 2.1 768 base model
 aria2c --console-log-level=error -c -x 16 -s 16 -k 1M https://huggingface.co/stabilityai/stable-diffusion-2-1/resolve/36a01dc742066de2e8c91e7cf0b8f6b53ef53da1/v2-1_768-ema-pruned.safetensors -d /app/stable-diffusion-webui/models/Stable-diffusion -o v2-1_768-ema-pruned.safetensors
 aria2c --console-log-level=error -c -x 16 -s 16 -k 1M https://raw.githubusercontent.com/Stability-AI/stablediffusion/fc1488421a2761937b9d54784194157882cbc3b1/configs/stable-diffusion/v2-inference-v.yaml -d /app/stable-diffusion-webui/models/Stable-diffusion -o v2-1_768-ema-pruned.yaml

run.py

@@ -4,7 +4,9 @@ import sys
 
 
 def on_start():
-    print("Executing './on_start.sh' (that installs xformers, downloads models, etc.)")
+    print("---------------")
+    print("Executing './on_start.sh' (downloads models, etc.)")
+    print("---------------")
     result = subprocess.run("./on_start.sh", shell=True, env=os.environ)
     if result.returncode != 0:
         raise RuntimeError(f"Error executing ./on_start.sh [exit code: {result.returncode}]")
@@ -15,6 +17,7 @@ def start():
 
     print("---------------")
     print(f"Launching {'API server' if '--nowebui' in sys.argv else 'Web UI'} with arguments: {' '.join(sys.argv[1:])}")
+    print("---------------")
     import webui  # type: ignore  # noqa
     if '--nowebui' in sys.argv:
         webui.api_only()