Mirrors/stable-diffusion-webui-docker
0
0
Fork 0
mirror of https://github.com/AbdBarho/stable-diffusion-webui-docker.git synced 2025-10-27 08:14:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update versions (#315)

Browse Source 
auto:
7a14c8ab45
invoke:
e4cd66216e

Also, fix script mounting in auto #295
This commit is contained in:
AbdBarho
2023-01-27 07:55:22 +01:00
committed by GitHub
parent 9d2a3388c3
commit eeb410f2de
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docker-compose.yml
View File

@@ -27,7 +27,7 @@ services:
<<: *base_service <<: *base_service
profiles: ["auto"] profiles: ["auto"]
build: ./services/AUTOMATIC1111 build: ./services/AUTOMATIC1111
image: sd-auto:39 image: sd-auto:40
environment: environment:
- CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api
@@ -42,7 +42,7 @@ services:
<<: *base_service <<: *base_service
profiles: ["invoke"] profiles: ["invoke"]
build: ./services/invoke/ build: ./services/invoke/
image: sd-invoke:19 image: sd-invoke:20
environment: environment:
- PRELOAD=true - PRELOAD=true
- CLI_ARGS= - CLI_ARGS=

5
services/AUTOMATIC1111/Dockerfile
View File

@@ -67,7 +67,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \
# Note: don't update the sha of previous versions because the install will take forever # Note: don't update the sha of previous versions because the install will take forever
# instead, update the repo state in a later step # instead, update the repo state in a later step
ARG SHA=93fad28a979727f9b1331dbdc447598824057cdc ARG SHA=7a14c8ab45da8a681792a6331d48a88dd684a0a9
RUN --mount=type=cache,target=/root/.cache/pip <<EOF RUN --mount=type=cache,target=/root/.cache/pip <<EOF
cd stable-diffusion-webui cd stable-diffusion-webui
git fetch git fetch
@@ -75,8 +75,7 @@ git reset --hard ${SHA}
pip install -r requirements_versions.txt pip install -r requirements_versions.txt
EOF EOF
RUN --mount=type=cache,target=/root/.cache/pip \ RUN --mount=type=cache,target=/root/.cache/pip pip install -U opencv-python-headless
pip install -U opencv-python-headless 'transformers>=4.24'
COPY . /docker COPY . /docker

3
services/AUTOMATIC1111/entrypoint.sh
View File

@@ -5,7 +5,8 @@ set -Eeuo pipefail
# TODO: move all mkdir -p ? # TODO: move all mkdir -p ?
mkdir -p /data/config/auto/scripts/ mkdir -p /data/config/auto/scripts/
# mount scripts individually # mount scripts individually
cp -vrTs /data/config/auto/scripts/ "${ROOT}/scripts/" find "${ROOT}/scripts/" -maxdepth 1 -type l -delete
cp -vrfTs /data/config/auto/scripts/ "${ROOT}/scripts/"
cp -n /docker/config.json /data/config/auto/config.json cp -n /docker/config.json /data/config/auto/config.json
jq '. * input' /data/config/auto/config.json /docker/config.json | sponge /data/config/auto/config.json jq '. * input' /data/config/auto/config.json /docker/config.json | sponge /data/config/auto/config.json

4
services/invoke/Dockerfile
View File

@@ -46,7 +46,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \
pip install triton /xformers-0.0.15-cp310-cp310-linux_x86_64.whl pip install triton /xformers-0.0.15-cp310-cp310-linux_x86_64.whl
ARG BRANCH=main SHA=89791d91e84abfc127ffecca21db68920781709f ARG BRANCH=main SHA=e4cd66216e0b941de7f27b4e2e260aa4f8c956e7
RUN --mount=type=cache,target=/root/.cache/pip <<EOF RUN --mount=type=cache,target=/root/.cache/pip <<EOF
git fetch git fetch
git reset --hard git reset --hard
@@ -58,7 +58,7 @@ rm req.txt
EOF EOF
RUN --mount=type=cache,target=/root/.cache/pip \ RUN --mount=type=cache,target=/root/.cache/pip \
pip install -U --force-reinstall opencv-python-headless huggingface_hub 'transformers>=4.24' && \ pip install -U --force-reinstall opencv-python-headless huggingface_hub && \
python3 -c "from patchmatch import patch_match" python3 -c "from patchmatch import patch_match"