Update versions (#77)
AUTOMATIC1111/stable-diffusion-webui@9e892d9 lstein/stable-diffusion@9bcb0df transformers==4.22 for caching Refs #78
This commit is contained in:
parent
6a66ff6abb
commit
84f9cb84e7
@ -1,13 +1,16 @@
|
||||
# syntax=docker/dockerfile:1
|
||||
|
||||
FROM alpine/git:2.36.2 as download
|
||||
|
||||
|
||||
RUN git clone --depth 1 https://github.com/CompVis/stable-diffusion.git repositories/stable-diffusion
|
||||
RUN git clone --depth 1 https://github.com/sczhou/CodeFormer.git repositories/CodeFormer
|
||||
RUN git clone --depth 1 https://github.com/salesforce/BLIP.git repositories/BLIP
|
||||
|
||||
RUN <<EOF
|
||||
# because taming-transformers is huge
|
||||
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/salesforce/BLIP.git repositories/BLIP
|
||||
git clone https://github.com/CompVis/taming-transformers.git repositories/taming-transformers
|
||||
git clone --depth 1 https://github.com/CompVis/taming-transformers.git repositories/taming-transformers
|
||||
rm -rf repositories/taming-transformers/data repositories/taming-transformers/assets
|
||||
EOF
|
||||
|
||||
@ -27,22 +30,21 @@ 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 13eec4f3d4081fdc43883c5ef02e471a2b6c7212
|
||||
conda env update --file environment-wsl2.yaml -n base
|
||||
conda clean -a -y
|
||||
git reset --hard 7e77938230d4fefb6edccdba0b80b61d8416673e
|
||||
pip install --prefer-binary --no-cache-dir -r requirements.txt
|
||||
EOF
|
||||
|
||||
ENV ROOT=/stable-diffusion-webui \
|
||||
WORKDIR=/stable-diffusion-webui/repositories/stable-diffusion
|
||||
|
||||
|
||||
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=99585b3514e2d7e987651d5c6a0806f933af012b
|
||||
ARG SHA=9e892d90ceaa6493d8b9092c89017485bb658c5b
|
||||
RUN <<EOF
|
||||
cd stable-diffusion-webui
|
||||
git pull --rebase
|
||||
|
@ -21,9 +21,6 @@ conda env update --file environment.yaml -n base
|
||||
conda clean -a -y
|
||||
EOF
|
||||
|
||||
# new dependency, should be added to the environment.yaml
|
||||
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 BRANCH=master
|
||||
@ -39,6 +36,8 @@ conda env update --file environment.yaml -n base
|
||||
conda clean -a -y
|
||||
EOF
|
||||
|
||||
RUN pip uninstall transformers -y && pip install -U --no-cache-dir pyperclip transformers==4.22
|
||||
|
||||
# Latent diffusion
|
||||
RUN <<EOF
|
||||
git clone https://github.com/Hafiidz/latent-diffusion.git
|
||||
|
@ -6,7 +6,8 @@ SHELL ["/bin/bash", "-ceuxo", "pipefail"]
|
||||
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
RUN conda install python=3.8.5 && conda clean -a -y
|
||||
# now it requires python3.9
|
||||
# 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 gcc -y && apt-get clean
|
||||
@ -15,13 +16,13 @@ RUN apt-get update && apt install fonts-dejavu-core rsync gcc -y && apt-get clea
|
||||
RUN <<EOF
|
||||
git clone https://github.com/lstein/stable-diffusion.git
|
||||
cd stable-diffusion
|
||||
git reset --hard 751283a2de81bee4bb571fbabe4adb19f1d85b97
|
||||
conda env update --file environment.yaml -n base
|
||||
conda clean -a -y
|
||||
# git reset --hard 751283a2de81bee4bb571fbabe4adb19f1d85b97
|
||||
# conda env update --file environment.yaml -n base
|
||||
# conda clean -a -y
|
||||
EOF
|
||||
|
||||
|
||||
ARG BRANCH=development SHA=45af30f3a4c98b50c755717831c5fff75a3a8b43
|
||||
ARG BRANCH=development SHA=9bcb0dff968bd7732ca7fa61b7cb3f6e1c8a7943
|
||||
# ARG BRANCH=main SHA=89da371f4841f7e05da5a1672459d700c3920784
|
||||
RUN <<EOF
|
||||
cd stable-diffusion
|
||||
@ -32,7 +33,7 @@ conda env update --file environment.yaml -n base
|
||||
conda clean -a -y
|
||||
EOF
|
||||
|
||||
RUN pip uninstall opencv-python -y && pip install --prefer-binary --upgrade --force-reinstall --no-cache-dir opencv-python-headless
|
||||
RUN pip uninstall opencv-python -y && pip install --prefer-binary --force-reinstall --no-cache-dir opencv-python-headless transformers==4.22
|
||||
|
||||
COPY . /docker/
|
||||
RUN python3 /docker/info.py /stable-diffusion/static/dream_web/index.html && chmod +x /docker/mount.sh
|
||||
|
@ -15,12 +15,16 @@ if test -f /cache/models/GFPGANv1.3.pth; then
|
||||
fi
|
||||
|
||||
# facexlib
|
||||
FACEX_WEIGHTS=/opt/conda/lib/python3.8/site-packages/facexlib/weights
|
||||
FACEX_WEIGHTS=/opt/conda/lib/python3.9/site-packages/facexlib/weights
|
||||
|
||||
rm -rf "${FACEX_WEIGHTS}"
|
||||
mkdir -p /cache/weights
|
||||
ln -sf -T /cache/weights "${FACEX_WEIGHTS}"
|
||||
|
||||
REALESRGAN_WEIGHTS=/opt/conda/lib/python3.9/site-packages/realesrgan/weights
|
||||
rm -rf "${REALESRGAN_WEIGHTS}"
|
||||
ln -sf -T /cache/weights "${REALESRGAN_WEIGHTS}"
|
||||
|
||||
if "${PRELOAD}" == "true"; then
|
||||
python3 -u scripts/preload_models.py
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user