docker container support

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -26,7 +26,7 @@ body:
     id: steps
     attributes:
       label: Steps to reproduce the problem
-      description: Please provide us with precise step by step information on how to reproduce the bug
+      description: Please provide us with precise step by step instructions on how to reproduce the bug
       value: |
         1. Go to .... 
         2. Press ....
@@ -37,64 +37,14 @@ body:
     id: what-should
     attributes:
       label: What should have happened?
-      description: Tell what you think the normal behavior should be
+      description: Tell us what you think the normal behavior should be
     validations:
       required: true
-  - type: input
-    id: commit
-    attributes:
-      label: Version or Commit where the problem happens
-      description: "Which webui version or commit are you running ? (Do not write *Latest Version/repo/commit*, as this means nothing and will have changed by the time we read your issue. Rather, copy the **Version: v1.2.3** link at the bottom of the UI, or from the cmd/terminal if you can't launch it.)"
-    validations:
-      required: true
-  - type: dropdown
-    id: py-version
-    attributes:
-      label: What Python version are you running on ?
-      multiple: false
-      options:
-        - Python 3.10.x
-        - Python 3.11.x (above, no supported yet)
-        - Python 3.9.x (below, no recommended)
-  - type: dropdown
-    id: platforms
-    attributes:
-      label: What platforms do you use to access the UI ?
-      multiple: true
-      options:
-        - Windows
-        - Linux
-        - MacOS
-        - iOS
-        - Android
-        - Other/Cloud
-  - type: dropdown
-    id: device
-    attributes:
-        label: What device are you running WebUI on?
-        multiple: true
-        options:
-        - Nvidia GPUs (RTX 20 above)
-        - Nvidia GPUs (GTX 16 below)
-        - AMD GPUs (RX 6000 above)
-        - AMD GPUs (RX 5000 below)
-        - CPU
-        - Other GPUs
-  - type: dropdown
-    id: cross_attention_opt
+  - type: textarea
+    id: sysinfo
     attributes:
-      label: Cross attention optimization
-      description: What cross attention optimization are you using, Settings -> Optimizations -> Cross attention optimization
-      multiple: false
-      options:
-        - Automatic
-        - xformers
-        - sdp-no-mem
-        - sdp
-        - Doggettx
-        - V1 
-        - InvokeAI
-        - "None "
+      label: Sysinfo
+      description: System info file, generated by WebUI. You can generate it in settings, on the Sysinfo page. Drag the file into the field to upload it. If you submit your report without including the sysinfo file, the report will be closed. If needed, review the report to make sure it includes no personal information you don't want to share. If you can't start WebUI, you can use --dump-sysinfo commandline argument to generate the file.
     validations:
       required: true
   - type: dropdown
@@ -108,21 +58,7 @@ body:
         - Brave
         - Apple Safari
         - Microsoft Edge
-  - type: textarea
-    id: cmdargs
-    attributes:
-      label: Command Line Arguments
-      description: Are you using any launching parameters/command line arguments (modified webui-user .bat/.sh) ? If yes, please write them below. Write "No" otherwise.
-      render: Shell
-    validations:
-      required: true
-  - type: textarea
-    id: extensions
-    attributes:
-      label: List of extensions
-      description: Are you using any extensions other than built-ins? If yes, provide a list, you can copy it at "Extensions" tab. Write "No" otherwise.
-    validations:
-      required: true
+        - Other
   - type: textarea
     id: logs
     attributes:

.github/workflows/docker-image.yaml

@@ -0,0 +1,30 @@
+name: Build and Push Docker Image
+
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Check Out Repo
+      uses: actions/checkout@v2
+
+    - name: Log in to Docker Hub
+      uses: docker/login-action@v1
+      with:
+        registry: docker.io
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
+
+    - name: Build and push Docker image
+      run: |
+        cd docker
+        ./build.sh

CHANGELOG.md

@@ -65,9 +65,12 @@
  * make progress bar work independently from live preview display which results in it being updated a lot more often
  * forbid Full live preview method for medvram and add a setting to undo the forbidding
  * make it possible to localize tooltips and placeholders
+ * add option to align with sgm repo's sampling implementation ([#12818](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/12818))
+ * Restore faces and Tiling generation parameters have been moved to settings out of main UI
+   * if you want to put them back into main UI, use `Options in main UI` setting on the UI page.
 
 ### Extensions and API:
- * gradio 3.41.0
+ * gradio 3.41.2
  * also bump versions for packages: transformers, GitPython, accelerate, scikit-image, timm, tomesd
  * support tooltip kwarg for gradio elements: gr.Textbox(label='hello', tooltip='world')
  * properly clear the total console progressbar when using txt2img and img2img from API
@@ -127,6 +130,20 @@
  * set devices.dtype_unet correctly
  * run RealESRGAN on GPU for non-CUDA devices ([#12737](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/12737))
  * prevent extra network buttons being obscured by description for very small card sizes ([#12745](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/12745))
+ * fix error that causes some extra networks to be disabled if both <lora:> and <lyco:> are present in the prompt
+ * fix defaults settings page breaking when any of main UI tabs are hidden
+ * fix incorrect save/display of new values in Defaults page in settings
+ * fix for Reload UI function: if you reload UI on one tab, other opened tabs will no longer stop working
+ * fix an error that prevents VAE being reloaded after an option change if a VAE near the checkpoint exists ([#12797](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/12737))
+ * hide broken image crop tool ([#12792](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/12737))
+ * don't show hidden samplers in dropdown for XYZ script ([#12780](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/12737))
+ * fix style editing dialog breaking if it's opened in both img2img and txt2img tabs
+ * fix a bug allowing users to bypass gradio and API authentication (reported by vysecurity) 
+ * fix notification not playing when built-in webui tab is inactive ([#12834](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/12834))
+ * honor `--skip-install` for extension installers ([#12832](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/12832))
+ * don't print blank stdout in extension installers ([#12833](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/12832), [#12855](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/12855))
+ * do not change quicksettings dropdown option when value returned is `None` ([#12854](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/12854))
+ * get progressbar to display correctly in extensions tab
 
 
 ## 1.5.2

docker/.gitignore

@@ -0,0 +1 @@
+docker-compose.override.yml

docker/Dockerfile

@@ -0,0 +1,32 @@
+FROM nvidia/cuda:11.7.1-cudnn8-runtime-ubuntu20.04
+
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get update && apt-get install -y --no-install-recommends \
+	libgl1 libglib2.0-0 \
+	python3 python3-venv \
+	git \
+	wget \
+	vim \
+	inetutils-ping \
+	sudo \
+	net-tools \
+	iproute2 \
+	&& \
+	apt-get clean && \
+	rm -rf /var/lib/apt/lists/*
+
+COPY webui.sh webui.sh
+
+# setup venv in /venv to avoid conflict with volume in /stable-diffusion-webui
+RUN echo 'venv_dir=/venv' > webui-user.sh
+
+ENV install_dir=/
+RUN ./webui.sh -f can_run_as_root --exit --skip-torch-cuda-test
+
+ENV VIRTUAL_ENV=/venv
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+
+WORKDIR "/stable-diffusion-webui/"
+VOLUME /root/.cache
+
+CMD ["python3", "launch.py", "--listen"]

docker/README.md

@@ -0,0 +1,53 @@
+# Docker and compose support for Stable Diffusion web UI
+
+This folder contains files necessary to build and run Stable Diffusion web UI as a docker container.
+<br/>
+As for now, only the Nvidia acceleration on Linux is supported.<br/>
+This docker image is intended mainly for people already familiar with docker and looking for 
+additional security provided by container isolation, for example when running untrusted scripts or
+models. Additional functionality as integration with 
+[docker-gen](https://github.com/nginx-proxy/docker-gen) and 
+[acme-companion](https://github.com/nginx-proxy/acme-companion) for automatic access via SSL might 
+come in handy too.
+
+
+## Requirements
+* A [docker](https://docs.docker.com/engine/install/) of course.
+* [Nvidia docker runtime](https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/install-guide.html#docker).
+
+
+# HOWTO
+
+1. Make sure you have [Nvidia docker runtime](https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/install-guide.html#docker)
+installed and configured properly, i.e.
+`docker run --rm --runtime=nvidia --gpus all nvidia/cuda:11.6.2-base-ubuntu20.04 nvidia-smi`
+outputs the information about your GPU.
+1. Enter this very directory `stable-diffusion-webui/docker`.
+1. Build the container using `./build.sh` or `docker compose build`.
+1. Run the container with `./run.sh`
+1. Wait for the UI to start then open the URL displayed on the screen:
+```
+ ./run.sh
+[+] Running 1/1
+ ⠿ Container docker-stable-diffusion-webui-1  Started                                                                                                                                                                                                                              11.2s
+
+Wait for the UI to start then point your browser to: http://localhost:xxxxx   <-----
+
+To stop showing the logs precc CTRL-C
+...
+```
+
+
+# Further info
+
+1. This image uses two volumes. One is used to store `~/.cache`, the other for 
+`stable-diffusion-webui/modules`. The latter is mounted in the `docker-compose.yml` to a 
+corresponding location inside the local path on your host. This is intended to make it easier
+for the user to manipulate model files.
+1. Beware though that inside container the UI is run as root. This has the implication that files
+written to volumes mounted to local path are owned by root! When needed you may change the 
+ownership of existing files with `sudo chown -R $UID:$GID modules`.
+1. To change the command line arguments or other configuration copy the `docker-compose.yml` file
+as `docker-compose.override.yml` and make necessary changes there. It's the `compose` mechanism and
+this way it won't conflict with the git. The part you are looking for is at the very end of the
+YAML file: `command: python3 launch.py --listen`

docker/build.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+set -Eeuo pipefail
+
+if [ "$(which docker-compose)" ]; then
+	compose='docker-compose'
+else
+	compose='docker compose'
+fi
+
+cp ../webui.sh .
+
+$compose build

docker/docker-compose.yml

@@ -0,0 +1,18 @@
+services:
+  stable-diffusion-webui:
+    runtime: nvidia
+    image: emsi/stable-diffusion-webui
+    build:
+      context: .
+      dockerfile: Dockerfile
+    ports:
+      - "7860"
+    environment:
+      - NVIDIA_VISIBLE_DEVICES=all
+    volumes:
+      - ..:/stable-diffusion-webui
+      - home:/root
+    command: python3 launch.py --listen
+
+volumes:
+  home:

docker/run.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+set -Eeuo pipefail
+
+if [ "$(which docker-compose)" ]; then
+	compose='docker-compose'
+else
+	compose='docker compose'
+fi
+
+$compose up -d
+
+echo -e "\nWait for the UI to start then point your browser to: http://localhost:$(docker compose ps --status running --format json | sed -e 's/.*"PublishedPort":\([0-9]\+\),.*/\1/g') \n\n"
+echo "To stop showing the logs press CTRL-C"
+$compose logs -f

extensions-builtin/Lora/ui_edit_user_metadata.py

@@ -70,6 +70,7 @@ def get_metadata_table(self, name):
         metadata = item.get("metadata") or {}
 
         keys = {
+            'ss_output_name': "Output name:",
             'ss_sd_model_name': "Model:",
             'ss_clip_skip': "Clip skip:",
             'ss_network_module': "Kohya module:",

javascript/extensions.js

@@ -33,7 +33,7 @@ function extensions_check() {
 
 
     var id = randomId();
-    requestProgress(id, gradioApp().getElementById('extensions_installed_top'), null, function() {
+    requestProgress(id, gradioApp().getElementById('extensions_installed_html'), null, function() {
 
     });
 

javascript/extraNetworks.js

@@ -249,6 +249,15 @@ function popup(contents) {
     globalPopup.style.display = "flex";
 }
 
+var storedPopupIds = {};
+function popupId(id) {
+    if (!storedPopupIds[id]) {
+        storedPopupIds[id] = gradioApp().getElementById(id);
+    }
+
+    popup(storedPopupIds[id]);
+}
+
 function extraNetworksShowMetadata(text) {
     var elem = document.createElement('pre');
     elem.classList.add('popup-metadata');

javascript/notification.js

@@ -15,7 +15,7 @@ onAfterUiUpdate(function() {
         }
     }
 
-    const galleryPreviews = gradioApp().querySelectorAll('div[id^="tab_"][style*="display: block"] div[id$="_results"] .thumbnail-item > img');
+    const galleryPreviews = gradioApp().querySelectorAll('div[id^="tab_"] div[id$="_results"] .thumbnail-item > img');
 
     if (galleryPreviews == null) return;
 

javascript/resizeHandle.js

@@ -134,6 +134,8 @@
 
 onUiLoaded(function() {
     for (var elem of gradioApp().querySelectorAll('.resize-handle-row')) {
-        setupResizeHandle(elem);
+        if (!elem.querySelector('.resize-handle')) {
+            setupResizeHandle(elem);
+        }
     }
 });

launch.py

@@ -25,6 +25,13 @@
 
 
 def main():
+    if args.dump_sysinfo:
+        filename = launch_utils.dump_sysinfo()
+
+        print(f"Sysinfo saved as {filename}. Exiting...")
+
+        exit(0)
+
     launch_utils.startup_timer.record("initial startup")
 
     with launch_utils.startup_timer.subcategory("prepare environment"):

modules/cmd_args.py

@@ -16,6 +16,7 @@
 parser.add_argument("--log-startup", action='store_true', help="launch.py argument: print a detailed log of what's happening at startup")
 parser.add_argument("--skip-prepare-environment", action='store_true', help="launch.py argument: skip all environment preparation")
 parser.add_argument("--skip-install", action='store_true', help="launch.py argument: skip installation of packages")
+parser.add_argument("--dump-sysinfo", action='store_true', help="launch.py argument: dump limited sysinfo file (without information about extensions, options) to disk and quit")
 parser.add_argument("--loglevel", type=str, help="log level; one of: CRITICAL, ERROR, WARNING, INFO, DEBUG", default=None)
 parser.add_argument("--do-not-download-clip", action='store_true', help="do not download CLIP model even if it's not included in the checkpoint")
 parser.add_argument("--data-dir", type=str, default=os.path.dirname(os.path.dirname(os.path.realpath(__file__))), help="base path where all user data is stored")

modules/errors.py

@@ -95,7 +95,7 @@ def check_versions():
 
     expected_torch_version = "2.0.0"
     expected_xformers_version = "0.0.20"
-    expected_gradio_version = "3.41.0"
+    expected_gradio_version = "3.41.2"
 
     if version.parse(torch.__version__) < version.parse(expected_torch_version):
         print_error_explanation(f"""