Skip to content

Commit

Permalink
Update auto & invoke (#277)
Browse files Browse the repository at this point in the history
  • Loading branch information
AbdBarho authored Jan 1, 2023
1 parent 6a3826c commit 78c90e5
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 23 deletions.
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ services:
<<: *base_service
profiles: ["auto"]
build: ./services/AUTOMATIC1111
image: sd-auto:25
image: sd-auto:26
environment:
- CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api

Expand Down Expand Up @@ -58,7 +58,7 @@ services:
<<: *base_service
profiles: ["invoke"]
build: ./services/invoke/
image: sd-invoke:14
image: sd-invoke:15
environment:
- PRELOAD=true
- CLI_ARGS=
2 changes: 1 addition & 1 deletion services/AUTOMATIC1111/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \
# 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=4af3ca5393151d61363c30eef4965e694eeac15e
ARG SHA=524d532b387732d4d32f237e792c7f201a934400
RUN --mount=type=cache,target=/root/.cache/pip <<EOF
cd stable-diffusion-webui
git fetch
Expand Down
10 changes: 4 additions & 6 deletions services/invoke/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ cd /usr/lib/x86_64-linux-gnu/pkgconfig/
ln -sf opencv4.pc opencv.pc
EOF

ARG BRANCH=main SHA=ffa54f4a35ed1aa5a574f911de9dab777cf01f3e
ARG BRANCH=main SHA=caf7caddf7230b36f793af52c2bc97332c025a07
RUN --mount=type=cache,target=/root/.cache/pip <<EOF
git fetch
git reset --hard
Expand All @@ -43,14 +43,12 @@ pip install -r binary_installer/py3.10-linux-x86_64-cuda-reqs.txt
EOF

RUN --mount=type=cache,target=/root/.cache/pip \
pip install --force-reinstall opencv-python-headless && python3 -c "from patchmatch import patch_match"
pip install -U --force-reinstall opencv-python-headless huggingface_hub && \
python3 -c "from patchmatch import patch_match"


RUN touch invokeai.init
COPY . /docker/
RUN <<EOF
python3 /docker/info.py /stable-diffusion/frontend/dist/index.html
touch invokeai.init
EOF


ENV ROOT=/stable-diffusion PYTHONPATH="${PYTHONPATH}:${ROOT}" PRELOAD=false CLI_ARGS=""
Expand Down
1 change: 0 additions & 1 deletion services/invoke/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ MOUNTS["${ROOT}/models/bert-base-uncased"]=/data/.cache/huggingface/transformers
MOUNTS["${ROOT}/models/openai/clip-vit-large-patch14"]=/data/.cache/huggingface/transformers/
MOUNTS["${ROOT}/models/CompVis/stable-diffusion-safety-checker"]=/data/.cache/huggingface/transformers/


MOUNTS["${ROOT}/embeddings"]=/data/embeddings/

# hacks
Expand Down
13 changes: 0 additions & 13 deletions services/invoke/info.py

This file was deleted.

0 comments on commit 78c90e5

Please sign in to comment.