Update Versions (#45)

* Update Automatic to 1b963c20

* Update hlky to dev branch

* Update automatic

AUTOMATIC1111/Dockerfile

@@ -4,40 +4,58 @@ FROM alpine/git:2.36.2 as download
 RUN <<EOF
 # who knows
 git config --global http.postBuffer 1048576000
+git clone https://github.com/sczhou/CodeFormer.git repositories/CodeFormer
 git clone https://github.com/CompVis/stable-diffusion.git repositories/stable-diffusion
 git clone https://github.com/CompVis/taming-transformers.git repositories/taming-transformers
 rm -rf repositories/taming-transformers/data repositories/taming-transformers/assets
 EOF
 
-FROM pytorch/pytorch:1.12.1-cuda11.3-cudnn8-runtime
+
+FROM continuumio/miniconda3:4.12.0
 
 SHELL ["/bin/bash", "-ceuxo", "pipefail"]
 
 ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && apt-get install git fonts-dejavu-core -y && apt-get clean
+
+RUN conda install python=3.8.5 && conda clean -a -y
+RUN conda install pytorch==1.11.0 torchvision==0.12.0 cudatoolkit=11.3 -c pytorch && conda clean -a -y
+
+RUN apt-get update && apt install fonts-dejavu-core rsync -y && apt-get clean
+
 
 RUN <<EOF
 git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
 cd stable-diffusion-webui
-git reset --hard db6db585eb9ee48e7315e28603e18531dbc87067
+git reset --hard 13eec4f3d4081fdc43883c5ef02e471a2b6c7212
-pip install -U --prefer-binary --no-cache-dir -r requirements.txt
+conda env update --file environment-wsl2.yaml -n base
+conda clean -a -y
+pip install --prefer-binary --no-cache-dir -r requirements.txt
 EOF
 
-RUN <<EOF
+ENV ROOT=/stable-diffusion-webui \
-pip install --prefer-binary -U --no-cache-dir opencv-python-headless markupsafe==2.0.1
+  WORKDIR=/stable-diffusion-webui/repositories/stable-diffusion
-EOF
-
-
-ENV ROOT=/workspace/stable-diffusion-webui \
-  WORKDIR=/workspace/stable-diffusion-webui/repositories/stable-diffusion \
-  TRANSFORMERS_CACHE=/cache/transformers TORCH_HOME=/cache/torch CLI_ARGS=""
 
 COPY --from=download /git/ ${ROOT}
+RUN pip install --prefer-binary --no-cache-dir -r ${ROOT}/repositories/CodeFormer/requirements.txt
 
+# Note: don't update the sha of previous versions because the install will take forever
+# instead, update the repo state in a later step
+ARG SHA=06fadd2dc5c2753558a9f3971568c2673819f48c
+RUN <<EOF
+cd stable-diffusion-webui
+git pull
+git reset --hard ${SHA}
+pip install --prefer-binary --no-cache-dir -r requirements.txt
+EOF
+
+RUN pip install --prefer-binary -U --no-cache-dir opencv-python-headless markupsafe==2.0.1
+
+ENV TRANSFORMERS_CACHE=/cache/transformers TORCH_HOME=/cache/torch CLI_ARGS=""
 
 COPY . /docker
+RUN chmod +x /docker/mount.sh && python3 /docker/info.py ${ROOT}/modules/ui.py
 
 WORKDIR ${WORKDIR}
 EXPOSE 7860
 # run, -u to not buffer stdout / stderr
-CMD /docker/mount.sh && python3 -u ../../webui.py --listen ${CLI_ARGS}
+CMD /docker/mount.sh && python3 -u ../../webui.py --listen --port 7860 ${CLI_ARGS}

AUTOMATIC1111/config.json

@@ -1,4 +1 @@
-{
+{"outdir_samples": "/output", "outdir_txt2img_samples": "/output/txt2img-images", "outdir_img2img_samples": "/output/img2img-images", "outdir_extras_samples": "/output/extras-images", "outdir_txt2img_grids": "/output/txt2img-grids", "outdir_img2img_grids": "/output/img2img-grids", "outdir_save": "/output/saved", "__WARNING__": "DON'T CHANGE ANYTHING BEFORE THIS", "outdir_grids": "", "save_to_dirs": false, "save_to_dirs_prompt_len": 10, "samples_save": true, "samples_format": "png", "grid_save": true, "return_grid": true, "grid_format": "png", "grid_extended_filename": false, "grid_only_if_multiple": true, "n_rows": -1, "jpeg_quality": 80, "export_for_4chan": true, "enable_pnginfo": true, "font": "DejaVuSans.ttf", "enable_emphasis": true, "save_txt": false, "ESRGAN_tile": 192, "ESRGAN_tile_overlap": 8, "random_artist_categories": [], "upscale_at_full_resolution_padding": 16, "show_progressbar": true, "show_progress_every_n_steps": 0, "multiple_tqdm": true, "face_restoration_model": "CodeFormer", "code_former_weight": 0.5}
-  "outdir_samples": "/output",
-  "font": "DejaVuSans.ttf"
-}

AUTOMATIC1111/docker-compose.yml

@@ -9,6 +9,7 @@ services:
       - ../cache:/cache
       - ../output:/output
       - ../models:/models
+      - ./config.json:/docker/config.json
     environment:
       - CLI_ARGS=--medvram --opt-split-attention
     deploy:

AUTOMATIC1111/info.py

@@ -0,0 +1,14 @@
+import sys
+from pathlib import Path
+
+file = Path(sys.argv[1])
+file.write_text(
+  file.read_text()\
+  .replace('    return demo', """
+    with demo:
+        gr.Markdown(
+          'Created by [AUTOMATIC1111 / stable-diffusion-webui-docker](https://github.com/AbdBarho/stable-diffusion-webui-docker/tree/master/AUTOMATIC1111)'
+        )
+    return demo
+""", 1)
+)

AUTOMATIC1111/mount.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 declare -A MODELS
 
 MODELS["${WORKDIR}/models/ldm/stable-diffusion-v1/model.ckpt"]=model.ckpt
@@ -17,12 +19,16 @@ for path in "${!MODELS[@]}"; do
 done
 
 # force realesrgan cache
-rm -rf /opt/conda/lib/python3.7/site-packages/realesrgan/weights
+rm -rf /opt/conda/lib/python3.8/site-packages/realesrgan/weights
-ln -s -T /models /opt/conda/lib/python3.7/site-packages/realesrgan/weights
+ln -s -T /models /opt/conda/lib/python3.8/site-packages/realesrgan/weights
 
 # force facexlib cache
 mkdir -p /cache/weights/ ${WORKDIR}/gfpgan/
 ln -sf /cache/weights/ ${WORKDIR}/gfpgan/
+# code former cache
+rm -rf ${ROOT}/repositories/CodeFormer/weights/CodeFormer ${ROOT}/repositories/CodeFormer/weights/facelib
+ln -sf -T /cache/weights ${ROOT}/repositories/CodeFormer/weights/CodeFormer
+ln -sf -T /cache/weights ${ROOT}/repositories/CodeFormer/weights/facelib
 
 # mount config
 ln -sf /docker/config.json ${WORKDIR}/config.json

README.md

@@ -1,4 +1,4 @@
-# Stable Diffusion WebUI Docker
+# Stable Diffusion WebUI Docker
 
 Run Stable Diffusion on your machine with a nice UI without any hassle!
 
@@ -9,6 +9,8 @@ Now with experimental support for 2 other forks:
 - [AUTOMATIC1111](./AUTOMATIC1111/) (Stable, very few bugs!)
 - [lstein](./lstein/)
 
+NOTE: big update coming up!
+
 ## Features
 
 - Interactive UI with many features, and more on the way!
@@ -67,7 +69,7 @@ You can find fixes to common issues [in the wiki page.](https://github.com/AbdBa
 
 ## Config
 
-in the `docker-compose.yml` you can change the `CLI_ARGS` variable, which contains the arguments that will be passed to the WebUI. By default: `--extra-models-cpu --optimized-turbo` are given, which allow you to use this model on a 6GB GPU. However, some features might not be available in the mode. [You can find the full list of arguments here.](https://github.com/hlky/stable-diffusion/blob/bb765f1897c968495ffe12a06b421d97b56d5ae1/scripts/webui.py)
+in the `docker-compose.yml` you can change the `CLI_ARGS` variable, which contains the arguments that will be passed to the WebUI. By default: `--extra-models-cpu --optimized-turbo` are given, which allow you to use this model on a 6GB GPU. However, some features might not be available in the mode. [You can find the full list of arguments here.](https://github.com/hlky/stable-diffusion-webui/blob/2b1ac8daf7ea82c6c56eabab7e80ec1c33106a98/scripts/webui.py)
 
 You can set the `WEBUI_SHA` to [any SHA from the main repo](https://github.com/hlky/stable-diffusion/commits/main), this will build the container against that commit. Use at your own risk.
 

docker-compose.yml

@@ -7,8 +7,8 @@ services:
       args:
         # You can choose any commit sha from https://github.com/hlky/stable-diffusion/commits/main
         # USE AT YOUR OWN RISK! otherwise just leave it empty.
+        BRANCH:
         WEBUI_SHA:
-    restart: on-failure
     ports:
       - "7860:7860"
     volumes:

hlky/Dockerfile

@@ -11,9 +11,9 @@ RUN apt-get update && apt install fonts-dejavu-core rsync -y && apt-get clean
 
 
 RUN <<EOF
-git clone https://github.com/hlky/stable-diffusion.git
+git clone https://github.com/sd-webui/stable-diffusion-webui.git stable-diffusion
 cd stable-diffusion
-git reset --hard c84748aa6802c2f934687883a79bde745d2a58a6
+git reset --hard 2b1ac8daf7ea82c6c56eabab7e80ec1c33106a98
 conda env update --file environment.yaml -n base
 conda clean -a -y
 EOF
@@ -23,22 +23,16 @@ RUN pip install -U --no-cache-dir pyperclip
 
 # Note: don't update the sha of previous versions because the install will take forever
 # instead, update the repo state in a later step
-ARG WEBUI_SHA=bb765f1897c968495ffe12a06b421d97b56d5ae1
+ARG BRANCH=dev
-RUN cd stable-diffusion && git pull && git reset --hard ${WEBUI_SHA} && \
+ARG WEBUI_SHA=be2ece06837e37d90181a17340c7e1aac91ba4fb
-  conda env update --file environment.yaml --name base && conda clean -a -y
+RUN <<EOF
-
+cd stable-diffusion
-
+git fetch
-# download dev UI version, update the sha below in case you want some other version
+git checkout ${BRANCH}
-# RUN <<EOF
+git reset --hard ${WEBUI_SHA}
-# git clone https://github.com/hlky/stable-diffusion-webui.git
+conda env update --file environment.yaml -n base
-# cd stable-diffusion-webui
+conda clean -a -y
-# # map to this file: https://github.com/hlky/stable-diffusion-webui/blob/master/.github/sync.yml
+EOF
-# git reset --hard 49e6178fd82ca736f9bbc621c6b12487c300e493
-# cp -t /stable-diffusion/scripts/ webui.py relauncher.py txt2img.yaml
-# cp -t /stable-diffusion/configs/webui webui.yaml
-# cp -t /stable-diffusion/frontend/ frontend/*
-# cd / && rm -rf stable-diffusion-webui
-# EOF
 
 # Textual inversion
 RUN <<EOF
@@ -62,7 +56,7 @@ EOF
 
 # add info
 COPY . /docker/
-RUN python /docker/info.py /stable-diffusion/frontend/frontend.py
+RUN python /docker/info.py /stable-diffusion/frontend/frontend.py && chmod +x /docker/mount.sh
 
 WORKDIR /stable-diffusion
 ENV TRANSFORMERS_CACHE=/cache/transformers TORCH_HOME=/cache/torch CLI_ARGS=""

hlky/mount.sh

@@ -26,6 +26,5 @@ if test -f /models/LDSR.yaml; then
 fi
 
 # force facexlib cache
-mkdir -p /cache/weights/
+mkdir -p /cache/weights/ /stable-diffusion/gfpgan/
-rm -rf /stable-diffusion/src/facexlib/facexlib/weights
+ln -sf /cache/weights/ /stable-diffusion/gfpgan/
-ln -sf /cache/weights/ /stable-diffusion/src/facexlib/facexlib/

lstein/docker-compose.yml

@@ -3,7 +3,6 @@ version: '3.9'
 services:
   model:
     build: .
-    restart: on-failure
     ports:
       - "7860:7860"
     volumes: