Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update versions #315

Merged
merged 1 commit into from
Jan 27, 2023
Merged

Update versions #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docker-compose.yml
View file
Open in desktop
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:39
image: sd-auto:40
environment:
- CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api

Expand All @@ -42,7 +42,7 @@ services:
<<: *base_service
profiles: ["invoke"]
build: ./services/invoke/
image: sd-invoke:19
image: sd-invoke:20
environment:
- PRELOAD=true
- CLI_ARGS=
Expand Down
5 changes: 2 additions & 3 deletions services/AUTOMATIC1111/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,15 @@ 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=93fad28a979727f9b1331dbdc447598824057cdc
ARG SHA=7a14c8ab45da8a681792a6331d48a88dd684a0a9
RUN --mount=type=cache,target=/root/.cache/pip <<EOF
cd stable-diffusion-webui
git fetch
git reset --hard ${SHA}
pip install -r requirements_versions.txt
EOF

RUN --mount=type=cache,target=/root/.cache/pip \
pip install -U opencv-python-headless 'transformers>=4.24'
RUN --mount=type=cache,target=/root/.cache/pip pip install -U opencv-python-headless

COPY . /docker

Expand Down
3 changes: 2 additions & 1 deletion services/AUTOMATIC1111/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ set -Eeuo pipefail
# TODO: move all mkdir -p ?
mkdir -p /data/config/auto/scripts/
# 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
jq '. * input' /data/config/auto/config.json /docker/config.json | sponge /data/config/auto/config.json
Expand Down
4 changes: 2 additions & 2 deletions services/invoke/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


ARG BRANCH=main SHA=89791d91e84abfc127ffecca21db68920781709f
ARG BRANCH=main SHA=e4cd66216e0b941de7f27b4e2e260aa4f8c956e7
RUN --mount=type=cache,target=/root/.cache/pip <<EOF
git fetch
git reset --hard
Expand All @@ -58,7 +58,7 @@ rm req.txt
EOF

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"


Expand Down