Merge branch 'master' into xf

docker-compose.yml

@@ -29,6 +29,7 @@ services:
     build: ./services/hlky/
     environment:
       - CLI_ARGS=--optimized-turbo
+      - USE_STREAMLIT=0
 
   auto: &automatic
     <<: *base_service

services/AUTOMATIC1111/Dockerfile

@@ -57,7 +57,7 @@ RUN apt-get install jq moreutils -y
 # 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=03d62538aebeff51713619fe808c953bdb70193d
+ARG SHA=36a0ba357ab0742c3c4a28437b68fb29a235afbe
 RUN <<EOF
 cd stable-diffusion-webui
 git pull --rebase
@@ -84,4 +84,4 @@ WORKDIR ${WORKDIR}
 EXPOSE 7860
 # run, -u to not buffer stdout / stderr
 CMD /docker/mount.sh && \
-  python3 -u ../../webui.py --listen --port 7860 --hide-ui-dir-config --ckpt-dir ${ROOT}/models/Stable-diffusion ${CLI_ARGS}
+  python3 -u ../../webui.py --listen --port 7860 --ckpt-dir ${ROOT}/models/Stable-diffusion ${CLI_ARGS}

services/hlky/Dockerfile

@@ -22,7 +22,7 @@ conda clean -a -y
 EOF
 
 
-ARG BRANCH=dev SHA=fd51bab1ec03543eb57faa954caab879ef2bafe7
+ARG BRANCH=dev SHA=bd57d22f2e0ec7eed084bdf2a4c0dcc0ed745daf
 RUN <<EOF
 cd stable-diffusion
 git fetch
@@ -34,12 +34,15 @@ EOF
 
 # add info
 COPY . /docker/
-RUN python /docker/info.py /stable-diffusion/frontend/frontend.py && chmod +x /docker/mount.sh
+RUN <<EOF
+python /docker/info.py /stable-diffusion/frontend/frontend.py
+chmod +x /docker/mount.sh /docker/run.sh
+# streamlit
+sed -i -- 's/8501/7860/g' /stable-diffusion/.streamlit/config.toml
+EOF
 
 WORKDIR /stable-diffusion
-ENV PYTHONPATH="${PYTHONPATH}:${PWD}" CLI_ARGS=""
+ENV PYTHONPATH="${PYTHONPATH}:${PWD}" STREAMLIT_SERVER_HEADLESS=true USE_STREAMLIT=0 CLI_ARGS=""
 EXPOSE 7860
 
-CMD /docker/mount.sh && \
-  python3 -u scripts/webui.py --outdir /output --ckpt /data/StableDiffusion/model.ckpt ${CLI_ARGS}
-# sed -i -- 's/8501/7860/g' .streamlit/config.toml && STREAMLIT_SERVER_HEADLESS=true python -u -m streamlit run scripts/webui_streamlit.py  --theme.base dark
+CMD /docker/mount.sh && /docker/run.sh

services/hlky/run.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -Eeuo pipefail
+
+echo "USE_STREAMLIT = ${USE_STREAMLIT}"
+if [ "${USE_STREAMLIT}" == "1" ]; then
+  python -u -m streamlit run scripts/webui_streamlit.py
+else
+  python3 -u scripts/webui.py --outdir /output --ckpt /data/StableDiffusion/model.ckpt ${CLI_ARGS}
+fi