From 31c21025ea72017bc92059723dce97a4531dbc8d Mon Sep 17 00:00:00 2001 From: Sebastian Piechowiak Date: Wed, 26 Oct 2022 19:13:31 +0200 Subject: [PATCH 1/4] Aria fixes (#170) Fixes WARN / ERRORs addressed in https://github.com/AbdBarho/stable-diffusion-webui-docker/issues/167 Closes #167 --- services/download/download.sh | 2 +- services/download/links.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/download/download.sh b/services/download/download.sh index e5520a2..4b609ec 100755 --- a/services/download/download.sh +++ b/services/download/download.sh @@ -6,7 +6,7 @@ mkdir -p /data/.cache /data/StableDiffusion /data/Codeformer /data/GFPGAN /data/ echo "Downloading, this might take a while..." -aria2c --input-file /docker/links.txt --dir /data --continue +aria2c --disable-ipv6 --input-file /docker/links.txt --dir /data --continue echo "Checking SHAs..." diff --git a/services/download/links.txt b/services/download/links.txt index 487afc3..fbf20bf 100644 --- a/services/download/links.txt +++ b/services/download/links.txt @@ -1,10 +1,10 @@ +# 'check-integrity=true' is the only way aria2c won't fail if the file already exists magnet:?xt=urn:btih:2daef5b5f63a16a9af9169a529b1a773fc452637&dn=v1-5-pruned-emaonly.ckpt&tr=udp%3a%2f%2ftracker.opentrackr.org%3a1337%2fannounce&tr=udp%3a%2f%2f9.rarbg.com%3a2810%2fannounce&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a6969%2fannounce&tr=udp%3a%2f%2fopentracker.i2p.rocks%3a6969%2fannounce&tr=https%3a%2f%2fopentracker.i2p.rocks%3a443%2fannounce&tr=http%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.torrent.eu.org%3a451%2fannounce&tr=udp%3a%2f%2fopen.stealth.si%3a80%2fannounce&tr=udp%3a%2f%2fvibe.sleepyinternetfun.xyz%3a1738%2fannounce&tr=udp%3a%2f%2ftracker2.dler.org%3a80%2fannounce&tr=udp%3a%2f%2ftracker1.bt.moack.co.kr%3a80%2fannounce&tr=udp%3a%2f%2ftracker.zemoj.com%3a6969%2fannounce&tr=udp%3a%2f%2ftracker.tiny-vps.com%3a6969%2fannounce&tr=udp%3a%2f%2ftracker.theoks.net%3a6969%2fannounce&tr=udp%3a%2f%2ftracker.publictracker.xyz%3a6969%2fannounce&tr=udp%3a%2f%2ftracker.monitorit4.me%3a6969%2fannounce&tr=udp%3a%2f%2ftracker.moeking.me%3a6969%2fannounce&tr=udp%3a%2f%2ftracker.lelux.fi%3a6969%2fannounce&tr=udp%3a%2f%2ftracker.dler.org%3a6969%2fannounce&tr=udp%3a%2f%2ftracker.army%3a6969%2fannounce select-file=1 index-out=1=StableDiffusion/v1-5-pruned-emaonly.ckpt follow-torrent=mem follow-metalink=mem seed-time=0 - # this is the only way aria2c won't fail if the file already exists check-integrity=true https://drive.yerf.org/wl/?id=EBfTrmcCCUAGaQBXVIj5lJmEhjoP1tgl&mode=grid&download=1 out=StableDiffusion/model.ckpt From 48f8650fd8c2ee6ce562d412f351be190179009b Mon Sep 17 00:00:00 2001 From: AbdBarho Date: Wed, 26 Oct 2022 20:02:00 +0200 Subject: [PATCH 2/4] Bump Versions (#178) - auto: https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/737eb28faca8be2bb996ee0930ec77d1f7ebd939 - hlky: https://github.com/sd-webui/stable-diffusion-webui/commit/5f6141ae7c8520b250896c80ac938396164f78df - lstein: https://github.com/invoke-ai/InvokeAI/commit/2b6d78e4363f3eca726228a40b6de832eb0ac040 --- docker-compose.yml | 6 +++--- services/AUTOMATIC1111/Dockerfile | 2 +- services/hlky/Dockerfile | 2 +- services/lstein/Dockerfile | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 71df7cc..056d061 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,7 +27,7 @@ services: <<: *base_service profiles: ["hlky"] build: ./services/hlky/ - image: sd-hlky:2 + image: sd-hlky:3 environment: - CLI_ARGS=--optimized-turbo - USE_STREAMLIT=0 @@ -36,7 +36,7 @@ services: <<: *base_service profiles: ["auto"] build: ./services/AUTOMATIC1111 - image: sd-auto:2 + image: sd-auto:3 environment: - CLI_ARGS=--allow-code --medvram --xformers @@ -51,7 +51,7 @@ services: <<: *base_service profiles: ["lstein"] build: ./services/lstein/ - image: sd-lstein:2 + image: sd-lstein:3 environment: - PRELOAD=true - CLI_ARGS= diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile index 6273daa..d5eb135 100644 --- a/services/AUTOMATIC1111/Dockerfile +++ b/services/AUTOMATIC1111/Dockerfile @@ -59,7 +59,7 @@ RUN apt-get install jq moreutils -y # 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=df0a1f83815c771246a7b1bca85d63feaefad8d1 +ARG SHA=737eb28faca8be2bb996ee0930ec77d1f7ebd939 RUN < Date: Wed, 26 Oct 2022 23:57:29 +0200 Subject: [PATCH 3/4] Contribution Info (#181) --- .github/pull_request_template.md | 8 ++++++++ .github/workflows/docker.yml | 8 +++++++- README.md | 4 +++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 619b7c6..0862e99 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,3 +1,11 @@ + + +Closes issue # + ### Update versions - auto: https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/ diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d17496c..9643132 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,6 +1,12 @@ name: Build Images -on: [push] +on: + push: + branches: master + pull_request: + paths: + - docker-compose.yml + - services jobs: build: diff --git a/README.md b/README.md index 4607a9b..ea7124d 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,9 @@ Visit the wiki for [Setup](https://github.com/AbdBarho/stable-diffusion-webui-do ## Contributing -Contributions are welcome! create an issue first of what you want to contribute (before you implement anything) so we can talk about it. +Contributions are welcome! + +### **Create an issue first of what you want to contribute (before you implement anything)** ## Disclaimer From fb5407a6bc15b2ab8b94a3c1875660f9e6fff9e2 Mon Sep 17 00:00:00 2001 From: AbdBarho Date: Thu, 27 Oct 2022 16:49:30 +0200 Subject: [PATCH 4/4] Smaller git clones (#179) Closes #135 --- docker-compose.yml | 2 +- services/AUTOMATIC1111/Dockerfile | 28 +++++++++++++++------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 056d061..3d5ad96 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,7 +36,7 @@ services: <<: *base_service profiles: ["auto"] build: ./services/AUTOMATIC1111 - image: sd-auto:3 + image: sd-auto:4 environment: - CLI_ARGS=--allow-code --medvram --xformers diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile index d5eb135..d9d6c40 100644 --- a/services/AUTOMATIC1111/Dockerfile +++ b/services/AUTOMATIC1111/Dockerfile @@ -4,23 +4,25 @@ FROM alpine/git:2.36.2 as download SHELL ["/bin/sh", "-ceuxo", "pipefail"] -RUN git clone https://github.com/CompVis/stable-diffusion.git repositories/stable-diffusion && cd repositories/stable-diffusion && git reset --hard 69ae4b35e0a0f6ee1af8bb9a5d0016ccb27e36dc - -RUN git clone https://github.com/sczhou/CodeFormer.git repositories/CodeFormer && cd repositories/CodeFormer && git reset --hard c5b4593074ba6214284d6acd5f1719b6c5d739af -RUN git clone https://github.com/salesforce/BLIP.git repositories/BLIP && cd repositories/BLIP && git reset --hard 48211a1594f1321b00f14c9f7a5b4813144b2fb9 - 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 -RUN git clone https://github.com/crowsonkb/k-diffusion.git repositories/k-diffusion && cd repositories/k-diffusion && git reset --hard f4e99857772fc3a126ba886aadf795a332774878 +RUN . /clone.sh taming-transformers https://github.com/CompVis/taming-transformers.git 24268930bf1dce879235a7fddd0b2355b84d7ea6 \ + && rm -rf data assets **/*.ipynb + +RUN . /clone.sh stable-diffusion https://github.com/CompVis/stable-diffusion.git 69ae4b35e0a0f6ee1af8bb9a5d0016ccb27e36dc \ + && rm -rf assets data/**/*.png data/**/*.jpg data/**/*.gif + +RUN . /clone.sh CodeFormer https://github.com/sczhou/CodeFormer.git c5b4593074ba6214284d6acd5f1719b6c5d739af \ + && rm -rf assets inputs + +RUN . /clone.sh BLIP https://github.com/salesforce/BLIP.git 48211a1594f1321b00f14c9f7a5b4813144b2fb9 +RUN . /clone.sh k-diffusion https://github.com/crowsonkb/k-diffusion.git f4e99857772fc3a126ba886aadf795a332774878 +RUN . /clone.sh clip-interrogator https://github.com/pharmapsychotic/clip-interrogator 2486589f24165c8e3b303f84e9dbbea318df83e8 -RUN git clone https://github.com/pharmapsychotic/clip-interrogator repositories/clip-interrogator && cd repositories/clip-interrogator && git reset --hard 2486589f24165c8e3b303f84e9dbbea318df83e8 FROM alpine:3 as xformers RUN apk add aria2