diff --git a/docker-compose.yml b/docker-compose.yml index e87ddef..f49d73d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -version: '3.9' x-base_service: &base_service ports: - "${WEBUI_PORT:-7860}:7860" diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile index d595784..ff0454f 100644 --- a/services/AUTOMATIC1111/Dockerfile +++ b/services/AUTOMATIC1111/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine/git:2.36.2 as download +FROM alpine/git:2.36.2 AS download COPY clone.sh /clone.sh @@ -30,7 +30,7 @@ WORKDIR / RUN --mount=type=cache,target=/root/.cache/pip \ git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git && \ cd stable-diffusion-webui && \ - git reset --hard v1.9.4 && \ + git reset --hard v1.10.0 && \ pip install -r requirements_versions.txt diff --git a/services/AUTOMATIC1111/clone.sh b/services/AUTOMATIC1111/clone.sh index cfdf0a2..2c37c41 100644 --- a/services/AUTOMATIC1111/clone.sh +++ b/services/AUTOMATIC1111/clone.sh @@ -8,4 +8,4 @@ git init git remote add origin "$2" git fetch origin "$3" --depth=1 git reset --hard "$3" -rm -rf .git +rm -rf .git \ No newline at end of file diff --git a/services/forge/Dockerfile b/services/forge/Dockerfile index 65d0f1e..d18f430 100644 --- a/services/forge/Dockerfile +++ b/services/forge/Dockerfile @@ -2,7 +2,6 @@ FROM alpine/git:2.36.2 AS download COPY clone.sh /clone.sh - RUN . /clone.sh stable-diffusion-stability-ai https://github.com/Stability-AI/stablediffusion.git cf1d67a6fd5ea1aa600c4df58e5b47da45f6bdbf \ && rm -rf assets data/**/*.png data/**/*.jpg data/**/*.gif @@ -35,7 +34,6 @@ RUN --mount=type=cache,target=/root/.cache/pip \ sed -i '/torch/d' requirements_versions.txt && \ pip install -r requirements_versions.txt - ENV ROOT=/stable-diffusion-webui-forge COPY --from=download /repositories/ ${ROOT}/repositories/ @@ -51,7 +49,6 @@ RUN git clone https://github.com/lllyasviel/huggingface_guess.git /tmp/huggingfa RUN --mount=type=cache,target=/root/.cache/pip \ pip install torchvision==0.18.1 - RUN --mount=type=cache,target=/root/.cache/pip \ pip install pyngrok xformers==0.0.27 pytorch_lightning torchdiffeq torchsde \ git+https://github.com/TencentARC/GFPGAN.git@8d2447a2d918f8eba5a4a01463fd48e45126a379 \ @@ -75,4 +72,4 @@ ENV NVIDIA_VISIBLE_DEVICES=all ENV CLI_ARGS="" EXPOSE 7860 ENTRYPOINT ["/docker/entrypoint.sh"] -CMD python -u webui.py --listen --port 7860 ${CLI_ARGS} +CMD python -u webui.py --listen --port 7860 ${CLI_ARGS} \ No newline at end of file diff --git a/services/forge/config.py b/services/forge/config.py index b06bf45..7ab28d7 100644 --- a/services/forge/config.py +++ b/services/forge/config.py @@ -76,4 +76,3 @@ if __name__ == '__main__': else: check_and_replace_config(DEFAULT_FILEPATH) -