Update Versions

Core: 64490d2df8b321d6562d3023210a30a2c5ad42b7
UI: e253a27a0fd5f252e9acb9b0003f7e3570ab7162

build/Dockerfile

@@ -13,15 +13,20 @@ RUN apt-get update && apt install fonts-dejavu-core && apt-get clean
 
 # Note: don't update the sha of previous versions because the install will take forever
 # instead, update the repo state in a later step
-RUN cd stable-diffusion && git pull && git reset --hard ac31d943ce0c99b7dd4df7e6cb1c14f2e275ca96 && \
+RUN cd stable-diffusion && git pull && git reset --hard 64490d2df8b321d6562d3023210a30a2c5ad42b7 && \
   conda env update --file environment.yaml --name base && conda clean -a -y
 
 # download dev UI version, update the sha below in case you want some other version
-RUN git clone https://github.com/hlky/stable-diffusion-webui.git && cd stable-diffusion-webui && \
+RUN <<EOF
-  git reset --hard 244f945c40b8dec3fd1faf8824b99abeb3bc4b97 && \
+git clone https://github.com/hlky/stable-diffusion-webui.git
-  cp -t /stable-diffusion/scripts/ txt2img.yaml webui.py webui.yaml webui_playground.py && \
+cd stable-diffusion-webui
+# map to this file: https://github.com/hlky/stable-diffusion-webui/blob/master/.github/sync.yml
+git reset --hard e253a27a0fd5f252e9acb9b0003f7e3570ab7162
+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
 
 # For testing different versions:
 # RUN git clone https://github.com/AbdBarho/stable-diffusion-webui.git && cd stable-diffusion-webui && \
@@ -30,16 +35,24 @@ RUN git clone https://github.com/hlky/stable-diffusion-webui.git && cd stable-di
 #   cd / && rm -rf stable-diffusion-webui
 
 
-WORKDIR /stable-diffusion
+# add info
-ENV TRANSFORMERS_CACHE=/cache/transformers TORCH_HOME=/cache/torch CLI_ARGS=""
-EXPOSE 7860
 COPY info.py /info.py
+RUN  python /info.py /stable-diffusion/frontend/frontend.py
+
+WORKDIR /stable-diffusion
+ENV TRANSFORMERS_CACHE=/cache/transformers TORCH_HOME=/cache/torch CLI_ARGS="" \
+  GFPGAN_PATH=/stable-diffusion/src/gfpgan/experiments/pretrained_models/GFPGANv1.3.pth \
+  RealESRGAN_PATH=/stable-diffusion/src/realesrgan/experiments/pretrained_models/RealESRGAN_x4plus.pth \
+  RealESRGAN_ANIME_PATH=/stable-diffusion/src/realesrgan/experiments/pretrained_models/RealESRGAN_x4plus_anime_6B.pth
+EXPOSE 7860
 CMD \
-  python /info.py scripts/webui.py && \
+  for path in "${GFPGAN_PATH}" "${RealESRGAN_PATH}" "${RealESRGAN_ANIME_PATH}"; do \
-  ln -sf /models/GFPGANv1.3.pth   /stable-diffusion/src/gfpgan/experiments/pretrained_models/GFPGANv1.3.pth && \
+  name=$(basename "${path}"); \
-  ln -sf /models/RealESRGAN_x4plus.pth   /stable-diffusion/src/realesrgan/experiments/pretrained_models/RealESRGAN_x4plus.pth && \
+  base=$(dirname "${path}"); \
+  test -f "/models/${name}" && mkdir -p "${base}" && ln -sf "/models/${name}" "${path}" && echo "Mounted ${name}";\
+  done;\
   # force facexlib cache
   mkdir -p /cache/weights/ && rm -rf /opt/conda/lib/python3.8/site-packages/facexlib/weights && \
   ln -sf  /cache/weights/ /opt/conda/lib/python3.8/site-packages/facexlib/ && \
   # run, -u to not buffer stdout / stderr
-  python3 -u scripts/webui.py --outdir /output --save-metadata --ckpt /models/model.ckpt ${CLI_ARGS}
+  python3 -u scripts/webui.py --outdir /output --ckpt /models/model.ckpt --save-metadata ${CLI_ARGS}

build/info.py

@@ -3,10 +3,13 @@ from pathlib import Path
 
 file = Path(sys.argv[1])
 file.write_text(
-  file.read_text().replace('<p>For help and advanced usage guides,', """
+  file.read_text()\
+  .replace('<p>For help and advanced usage guides,', """
   <p>
     Created using <a href="https://github.com/AbdBarho/stable-diffusion-webui-docker">stable-diffusion-webui-docker</a>.
   </p>
   <p>For help and advanced usage guides,
-""")
+""", 1)\
+  .replace('img2img_cfg = gr.Slider(minimum=1.0, maximum=30.0', 'img2img_cfg = gr.Slider(minimum=1.0, maximum=60.0')
+
 )