Mirrors/stable-diffusion-webui-docker
0
0
Fork 0
mirror of https://github.com/AbdBarho/stable-diffusion-webui-docker.git synced 2025-10-30 17:53:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update versions (#185)

Browse Source 
- auto:
35c45df28b
- hlky:
091520bed0
- lstein:
fdf9b1c40c
This commit is contained in:
AbdBarho
2022-10-29 22:02:35 +02:00
committed by GitHub
parent fb5407a6bc
commit 4464e9d9e9
5 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docker-compose.yml
View File

@@ -27,7 +27,7 @@ services:
<<: *base_service
profiles: ["hlky"]
build: ./services/hlky/
image: sd-hlky:3
image: sd-hlky:4
environment:
- CLI_ARGS=--optimized-turbo
- USE_STREAMLIT=0
@@ -36,7 +36,7 @@ services:
<<: *base_service
profiles: ["auto"]
build: ./services/AUTOMATIC1111
image: sd-auto:4
image: sd-auto:5
environment:
- CLI_ARGS=--allow-code --medvram --xformers
@@ -51,7 +51,7 @@ services:
<<: *base_service
profiles: ["lstein"]
build: ./services/lstein/
image: sd-lstein:3
image: sd-lstein:4
environment:
- PRELOAD=true
- CLI_ARGS=

27
services/AUTOMATIC1111/Dockerfile
View File

@@ -36,35 +36,36 @@ ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1 PIP_NO_CACHE_DIR=1
RUN pip install torch==1.12.1+cu113 torchvision==0.13.1+cu113 --extra-index-url https://download.pytorch.org/whl/cu113
RUN apt-get update && apt install fonts-dejavu-core rsync git -y && apt-get clean
RUN apt-get update && apt install fonts-dejavu-core rsync git jq moreutils -y && apt-get clean
RUN <<EOF
git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
cd stable-diffusion-webui
git reset --hard 1eb588cbf19924333b88beaa1ac0041904966640
git reset --hard d885a4a57b72152745ca76192ef1bdda29e6461d
pip install -r requirements_versions.txt
EOF
ENV ROOT=/stable-diffusion-webui \
WORKDIR=/stable-diffusion-webui/repositories/stable-diffusion
COPY --from=xformers /wheel.whl xformers-0.0.14.dev0-cp310-cp310-linux_x86_64.whl
RUN pip install xformers-0.0.14.dev0-cp310-cp310-linux_x86_64.whl && rm xformers-0.0.14.dev0-cp310-cp310-linux_x86_64.whl
ENV ROOT=/stable-diffusion-webui
COPY --from=download /git/ ${ROOT}
RUN mkdir ${ROOT}/interrogate && cp ${ROOT}/repositories/clip-interrogator/data/* ${ROOT}/interrogate
RUN pip install --prefer-binary --no-cache-dir -r ${ROOT}/repositories/CodeFormer/requirements.txt
# TODO: move to top
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=737eb28faca8be2bb996ee0930ec77d1f7ebd939
ARG SHA=35c45df28b303a05d56a13cb56d4046f08cf8c25
RUN <<EOF
cd stable-diffusion-webui
git pull --rebase
git fetch
git reset --hard ${SHA}
pip install -r requirements_versions.txt
EOF
@@ -76,17 +77,13 @@ RUN pip install opencv-python-headless \
gradio==3.4.1
# gradio because #173 & https://github.com/AUTOMATIC1111/stable-diffusion-webui/issues/2858
COPY --from=xformers /wheel.whl xformers-0.0.14.dev0-cp310-cp310-linux_x86_64.whl
RUN pip install xformers-0.0.14.dev0-cp310-cp310-linux_x86_64.whl
COPY . /docker
RUN <<EOF
chmod +x /docker/mount.sh && python3 /docker/info.py ${ROOT}/modules/ui.py
EOF
RUN chmod +x /docker/mount.sh && python3 /docker/info.py ${ROOT}/modules/ui.py
WORKDIR ${ROOT}/repositories/stable-diffusion
ENV CLI_ARGS=""
WORKDIR ${WORKDIR}
EXPOSE 7860
# run, -u to not buffer stdout / stderr
CMD /docker/mount.sh && \

9
services/hlky/Dockerfile
View File

@@ -12,17 +12,20 @@ RUN conda install pytorch==1.11.0 torchvision==0.12.0 cudatoolkit=11.3 -c pytorc
RUN apt-get update && apt install fonts-dejavu-core rsync gcc -y && apt-get clean
ENV PIP_PREFER_BINARY=1 PIP_NO_CACHE_DIR=1
RUN <<EOF
git config --global http.postBuffer 1048576000
git clone https://github.com/sd-webui/stable-diffusion-webui.git stable-diffusion
git clone https://github.com/Sygil-Dev/sygil-webui.git stable-diffusion
cd stable-diffusion
git reset --hard 1a9c053cb7b6832695771db2555c0adc9b41e95f
git reset --hard 091520bed06f913c9f432f9f47ccbe22b46068d7
conda env update --file environment.yaml -n base
conda clean -a -y
EOF
RUN apt-get update && apt install libsndfile1 ffmpeg -y && apt-get clean
ARG BRANCH=dev SHA=5f6141ae7c8520b250896c80ac938396164f78df
ARG BRANCH=master SHA=091520bed06f913c9f432f9f47ccbe22b46068d7
RUN <<EOF
cd stable-diffusion
git fetch

1
services/hlky/mount.sh
View File

@@ -16,6 +16,7 @@ MOUNTS["${PWD}/models/custom"]=/data/StableDiffusion
# hack
MOUNTS["${PWD}/models/gfpgan/GFPGANv1.3.pth"]=/data/GFPGAN/GFPGANv1.4.pth
MOUNTS["${PWD}/models/gfpgan/GFPGANv1.4.pth"]=/data/GFPGAN/GFPGANv1.4.pth
MOUNTS["${PWD}/gfpgan/weights"]=/data/.cache
for to_path in "${!MOUNTS[@]}"; do

12
services/lstein/Dockerfile
View File

@@ -4,27 +4,25 @@ FROM continuumio/miniconda3:4.12.0
SHELL ["/bin/bash", "-ceuxo", "pipefail"]
ENV DEBIAN_FRONTEND=noninteractive
ENV DEBIAN_FRONTEND=noninteractive PIP_EXISTS_ACTION=w PIP_PREFER_BINARY=1 PIP_NO_CACHE_DIR=1
# now it requires python3.9
RUN conda install python=3.9 && 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 gcc -y && apt-get clean
ENV PIP_EXISTS_ACTION=w
RUN apt-get update && apt install fonts-dejavu-core -y && apt-get clean
RUN <<EOF
git clone https://github.com/invoke-ai/InvokeAI.git stable-diffusion
cd stable-diffusion
git reset --hard 79e79b78aaeedb49afcc795e0e00eebfdbedee96
git reset --hard 986cc49d7a8441a70c709c04a55016a1c783f2ed
git config --global http.postBuffer 1048576000
conda env update --file environment.yml -n base
# conda env update --file environment.yml -n base
conda clean -a -y
EOF
ARG BRANCH=development SHA=2b6d78e4363f3eca726228a40b6de832eb0ac040
ARG BRANCH=development SHA=fdf9b1c40c243d6806e787877e42ae4c115790ee
RUN <<EOF
cd stable-diffusion
git fetch