diff --git a/data/.gitignore b/data/.gitignore index cb0a526..5194313 100644 --- a/data/.gitignore +++ b/data/.gitignore @@ -20,3 +20,5 @@ /VAE /embeddings /Lora +/ControlNet +/openpose diff --git a/docker-compose.yml b/docker-compose.yml index 1b7a9aa..7864f45 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -28,7 +28,7 @@ services: <<: *base_service profiles: ["auto"] build: ./services/AUTOMATIC1111 - image: sd-auto:49 + image: sd-auto:51 environment: - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api @@ -43,10 +43,10 @@ services: <<: *base_service profiles: ["invoke"] build: ./services/invoke/ - image: sd-invoke:26 + image: sd-invoke:27 environment: - PRELOAD=true - - CLI_ARGS= + - CLI_ARGS=--no-nsfw_checker --no-safety_checker --xformers sygil: &sygil <<: *base_service @@ -67,8 +67,8 @@ services: <<: *base_service profiles: ["comfy"] build: ./services/comfy/ - image: sd-comfy:1 + image: sd-comfy:6 volumes: - *v2 environment: - - CLI_ARGS= + - CLI_ARGS= \ No newline at end of file diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile index b2d44d8..a610d0c 100644 --- a/services/AUTOMATIC1111/Dockerfile +++ b/services/AUTOMATIC1111/Dockerfile @@ -1,14 +1,6 @@ -# syntax=docker/dockerfile:1 - FROM alpine/git:2.36.2 as download -SHELL ["/bin/sh", "-ceuxo", "pipefail"] - -RUN < /clone.sh -mkdir -p repositories/"$1" && cd repositories/"$1" && git init && git remote add origin "$2" && git fetch origin "$3" --depth=1 && git reset --hard "$3" && rm -rf .git -EOE -EOF +COPY clone.sh /clone.sh RUN . /clone.sh taming-transformers https://github.com/CompVis/taming-transformers.git 24268930bf1dce879235a7fddd0b2355b84d7ea6 \ && rm -rf data assets **/*.ipynb @@ -30,21 +22,19 @@ RUN aria2c -x 5 --dir / --out wheel.whl 'https://github.com/AbdBarho/stable-diff FROM python:3.10.9-slim -SHELL ["/bin/bash", "-ceuxo", "pipefail"] - ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1 -RUN PIP_NO_CACHE_DIR=1 pip install torch==1.13.1+cu117 torchvision --extra-index-url https://download.pytorch.org/whl/cu117 +RUN --mount=type=cache,target=/root/.cache/pip \ + pip install torch==1.13.1+cu117 torchvision --extra-index-url https://download.pytorch.org/whl/cu117 RUN apt-get update && apt install fonts-dejavu-core rsync git jq moreutils -y && apt-get clean -RUN --mount=type=cache,target=/root/.cache/pip <=4.24' # add info COPY . /docker/ -RUN < req.txt -pip install -r req.txt -rm req.txt -EOF - # patch match: # https://github.com/invoke-ai/InvokeAI/blob/main/docs/installation/INSTALL_PATCHMATCH.md -RUN <=4.24' # add info COPY . /docker/ -RUN <