what i have right now

This commit is contained in:
Steven Lu (5950X 20.04[tmux]) 2023-07-14 05:39:32 -04:00 committed by Steven Lu (5950X 20.04)
parent 103e11493b
commit 27c560cdcd
3 changed files with 14 additions and 7 deletions

View file

@ -4,8 +4,9 @@ x-base_service: &base_service
ports: ports:
- "${WEBUI_PORT:-7860}:7860" - "${WEBUI_PORT:-7860}:7860"
volumes: volumes:
- &v1 ./data:/data - &v1 /vat/backups/StableDiffusion/data:/data
- &v2 ./output:/output - &v2 ./output:/output
- ./models_on_nvme:/data/models/Stable-diffusion/nvme
stop_signal: SIGKILL stop_signal: SIGKILL
tty: true tty: true
deploy: deploy:
@ -31,7 +32,8 @@ services:
build: ./services/AUTOMATIC1111 build: ./services/AUTOMATIC1111
image: sd-auto:62 image: sd-auto:62
environment: environment:
- CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api # - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api --distributed-remotes testrig_ftw3:192.168.1.41:7860 velka7:192.168.1.20:7860 --distributed-skip-verify-remotes --distributed-remotes-autosave --distributed-debug
- CLI_ARGS=--allow-code --xformers --enable-insecure-extension-access --api --listen
auto-cpu: auto-cpu:
<<: *automatic <<: *automatic
@ -62,7 +64,7 @@ services:
build: ./services/comfy/ build: ./services/comfy/
image: sd-comfy:3 image: sd-comfy:3
environment: environment:
- CLI_ARGS= - CLI_ARGS=--preview-method=taesd
comfy-cpu: comfy-cpu:

View file

@ -10,13 +10,12 @@ RUN apt-get update && apt-get install -y git && apt-get clean
ENV ROOT=/stable-diffusion ENV ROOT=/stable-diffusion
RUN --mount=type=cache,target=/root/.cache/pip \ RUN --mount=type=cache,target=/root/.cache/pip \
git clone https://github.com/comfyanonymous/ComfyUI.git ${ROOT} && \ git clone https://github.com/unphased/ComfyUI.git ${ROOT} && \
cd ${ROOT} && \ cd ${ROOT} && \
git checkout master && \ git checkout master && \
git reset --hard 884ea653c8d6fe19b3724f45a04a0d74cd881f2f && \ # git reset --hard 884ea653c8d6fe19b3724f45a04a0d74cd881f2f && \
pip install -r requirements.txt pip install -r requirements.txt
RUN --mount=type=cache,target=/root/.cache/pip \ RUN --mount=type=cache,target=/root/.cache/pip \
--mount=type=bind,from=xformers,source=/wheel.whl,target=/xformers-0.0.21-cp310-cp310-linux_x86_64.whl \ --mount=type=bind,from=xformers,source=/wheel.whl,target=/xformers-0.0.21-cp310-cp310-linux_x86_64.whl \
pip install /xformers-0.0.21-cp310-cp310-linux_x86_64.whl pip install /xformers-0.0.21-cp310-cp310-linux_x86_64.whl
@ -26,13 +25,18 @@ WORKDIR ${ROOT}
ARG BRANCH=master SHA=8607c2d42d10b0108de02528e813cc703e58813f ARG BRANCH=master SHA=8607c2d42d10b0108de02528e813cc703e58813f
RUN --mount=type=cache,target=/root/.cache/pip \ RUN --mount=type=cache,target=/root/.cache/pip \
ls -la models && \
ls -la models/vae_approx && \
git fetch && \ git fetch && \
git checkout ${BRANCH} && \ git checkout ${BRANCH} && \
git reset --hard ${SHA} && \ echo cach_bust 2 && \
git pull && \
# git reset --hard ${SHA} && \
pip install -r requirements.txt pip install -r requirements.txt
# add info # add info
COPY . /docker/ COPY . /docker/
RUN ls -la /docker
RUN cp /docker/extra_model_paths.yaml ${ROOT} RUN cp /docker/extra_model_paths.yaml ${ROOT}
ENV NVIDIA_VISIBLE_DEVICES=all ENV NVIDIA_VISIBLE_DEVICES=all

View file

@ -15,6 +15,7 @@ a111:
gligen: models/GLIGEN gligen: models/GLIGEN
clip: models/CLIPEncoder clip: models/CLIPEncoder
embeddings: embeddings embeddings: embeddings
vae_approx: models/vae_approx
custom_nodes: config/comfy/custom_nodes custom_nodes: config/comfy/custom_nodes