diff --git a/LICENSE b/LICENSE index 636ad71..3599d2b 100644 --- a/LICENSE +++ b/LICENSE @@ -92,5 +92,11 @@ use). By using this software, you also agree to the following licenses: https://github.com/CompVis/stable-diffusion/blob/main/LICENSE +https://github.com/sd-webui/stable-diffusion-webui/blob/master/LICENSE +https://github.com/invoke-ai/InvokeAI/blob/main/LICENSE +https://github.com/cszn/BSRGAN/blob/main/LICENSE +https://github.com/sczhou/CodeFormer/blob/master/LICENSE https://github.com/TencentARC/GFPGAN/blob/master/LICENSE https://github.com/xinntao/Real-ESRGAN/blob/master/LICENSE +https://github.com/xinntao/ESRGAN/blob/master/LICENSE +https://github.com/cszn/SCUNet/blob/main/LICENSE diff --git a/README.md b/README.md index a905bfb..4607a9b 100644 --- a/README.md +++ b/README.md @@ -23,16 +23,16 @@ This repository provides multiple UIs for you to play around with stable diffusi | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | | ![](https://user-images.githubusercontent.com/24505302/189541954-46afd772-d0c8-4005-874c-e2eca40c02f2.jpg) | ![](https://user-images.githubusercontent.com/24505302/189541956-5b528de7-1b5d-479f-a1db-d3f5a53afc59.jpg) | ![](https://user-images.githubusercontent.com/24505302/189541957-cf78b352-a071-486d-8889-f26952779a61.jpg) | -### hlky +### hlky (sd-webui / sygil-webui) -[hlky's fork](https://github.com/hlky/stable-diffusion-webui) is one of the most popular UIs, with many features: +[hlky's fork](https://github.com/Sygil-Dev/sygil-webui) is one of the most popular UIs, with many features: - Text to image, with many samplers - Image to image, with masking, cropping, in-painting, variations. - GFPGAN, RealESRGAN, LDSR, GoBig, GoLatent - Loopback, prompt weighting - 6GB or even 4GB GPU support! -- [Full feature list here](https://github.com/sd-webui/stable-diffusion-webui/blob/master/README.md) +- [Full feature list here](https://github.com/Sygil-Dev/sygil-webui/blob/master/README.md) Screenshots: @@ -42,7 +42,7 @@ Screenshots: -### lstein +### lstein (InvokeAI) [lstein's fork](https://github.com/invoke-ai/InvokeAI) is one of the earliest with a wonderful WebUI. - Text to image, with many samplers diff --git a/docker-compose.yml b/docker-compose.yml index ec5c4b1..71df7cc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,6 +27,7 @@ services: <<: *base_service profiles: ["hlky"] build: ./services/hlky/ + image: sd-hlky:2 environment: - CLI_ARGS=--optimized-turbo - USE_STREAMLIT=0 @@ -35,6 +36,7 @@ services: <<: *base_service profiles: ["auto"] build: ./services/AUTOMATIC1111 + image: sd-auto:2 environment: - CLI_ARGS=--allow-code --medvram --xformers @@ -49,6 +51,7 @@ services: <<: *base_service profiles: ["lstein"] build: ./services/lstein/ + image: sd-lstein:2 environment: - PRELOAD=true - CLI_ARGS= diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile index 19589a9..fe54c4a 100644 --- a/services/AUTOMATIC1111/Dockerfile +++ b/services/AUTOMATIC1111/Dockerfile @@ -20,10 +20,11 @@ EOF RUN git clone https://github.com/crowsonkb/k-diffusion.git repositories/k-diffusion && cd repositories/k-diffusion && git reset --hard f4e99857772fc3a126ba886aadf795a332774878 -FROM python:3.10-slim as xformers -SHELL ["/bin/bash", "-ceuxo", "pipefail"] -RUN pip install gdown -RUN gdown https://drive.google.com/uc?id=1SqwicrLx1TrG_sbbEoIF_3TUHd4EYSmw -O /wheel.whl +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 +RUN aria2c --dir / --out wheel.whl 'https://github.com/AbdBarho/stable-diffusion-webui-docker/releases/download/2.1.0/xformers-0.0.14.dev0-cp310-cp310-linux_x86_64.whl' FROM python:3.10-slim @@ -48,6 +49,7 @@ ENV ROOT=/stable-diffusion-webui \ COPY --from=download /git/ ${ROOT} +RUN mkdir ${ROOT}/interrogate && cp ${ROOT}/repositories/clip-interrogator/data/* ${ROOT}/interrogate RUN pip install --prefer-binary --no-cache-dir -r ${ROOT}/repositories/CodeFormer/requirements.txt # TODO: move to top @@ -62,18 +64,20 @@ RUN [[ ${DEEPDANBOORU:-"0"} == "0" ]] && : || /docker/optional-deepdanbooru.sh # 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=36a0ba357ab0742c3c4a28437b68fb29a235afbe +ARG SHA=df0a1f83815c771246a7b1bca85d63feaefad8d1 RUN <