diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md index 0ea8726..51a1a45 100644 --- a/.github/ISSUE_TEMPLATE/bug.md +++ b/.github/ISSUE_TEMPLATE/bug.md @@ -7,13 +7,17 @@ assignees: '' --- -**Has this issue been opened before? Check the [FAQ](https://github.com/AbdBarho/stable-diffusion-webui-docker/wiki/Main), the [issues](https://github.com/AbdBarho/stable-diffusion-webui-docker/issues?q=is%3Aissue) and in [the issues in the WebUI repo](https://github.com/hlky/stable-diffusion-webui)** +**Has this issue been opened before? Check the [FAQ](https://github.com/AbdBarho/stable-diffusion-webui-docker/wiki/Main), the [issues](https://github.com/AbdBarho/stable-diffusion-webui-docker/issues?q=is%3Aissue)** **Describe the bug** +**Which UI** + +hlky or auto or auto-cpu or lstein? + **Steps to Reproduce** 1. Go to '...' 2. Click on '....' @@ -22,8 +26,11 @@ assignees: '' **Hardware / Software:** - OS: [e.g. Windows / Ubuntu and version] + - RAM: - GPU: [Nvidia 1660 / No GPU] - - Version [e.g. 22] + - VRAM: + - Docker Version, Docker compose version + - Release version [e.g. 1.0.1] **Additional context** Any other context about the problem here. If applicable, add screenshots to help explain your problem. diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 7a5a589..d17496c 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -3,13 +3,17 @@ name: Build Images on: [push] jobs: - build_all: + build: + strategy: + matrix: + profile: + - auto + - hlky + - lstein + - download runs-on: ubuntu-latest - name: All + name: ${{ matrix.profile }} steps: - uses: actions/checkout@v3 # better caching? - - run: docker compose --profile auto build --progress plain - - run: docker compose --profile hlky build --progress plain - - run: docker compose --profile lstein build --progress plain - - run: docker compose --profile download build --progress plain + - run: docker compose --profile ${{ matrix.profile }} build --progress plain diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml new file mode 100644 index 0000000..66a18c5 --- /dev/null +++ b/.github/workflows/stale.yml @@ -0,0 +1,20 @@ +name: 'Close stale issues and PRs' +on: + schedule: + - cron: '30 1 * * *' + +jobs: + stale: + runs-on: ubuntu-latest + steps: + - uses: actions/stale@v5 + with: + only-labels: awaiting-response + stale-issue-message: This issue is stale because it has been open 14 days with no activity. Remove stale label or comment or this will be closed in 7 days. + stale-pr-message: This PR is stale because it has been open 14 days with no activity. Remove stale label or comment or this will be closed in 7 days. + close-issue-message: This issue was closed because it has been stalled for 7 days with no activity. + close-pr-message: This PR was closed because it has been stalled for 7 days with no activity. + days-before-issue-stale: 14 + days-before-pr-stale: 14 + days-before-issue-close: 7 + days-before-pr-close: 7 diff --git a/README.md b/README.md index cefc7e7..20dc019 100644 --- a/README.md +++ b/README.md @@ -7,12 +7,12 @@ This repository provides multiple UIs for you to play around with stable diffusi ## Quick Start - Install [Taskfile](https://taskfile.dev/installation?ref=AbdBarho-stable-diffusion-webui-docker) - - Quick Snippet: - - Linux: `sudo snap install task --classic` - - MacOS: `HOMEBREW_NO_AUTO_UPDATE=1 brew install go-task/tap/go-task` - - Windows: `choco install go-task -y` or `scoop install task` - - Curl: `sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d -b ~/.local/bin` - - Go: `go install github.com/go-task/task/v3/cmd/task@latest` + - Quick Snippet: + - Linux: `sudo snap install task --classic` + - MacOS: `HOMEBREW_NO_AUTO_UPDATE=1 brew install go-task/tap/go-task` + - Windows: `choco install go-task -y` or `scoop install task` + - Curl: `sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d -b ~/.local/bin` + - Go: `go install github.com/go-task/task/v3/cmd/task@latest` - Run `task` and see a list of all the pre-built tasks. @@ -27,7 +27,6 @@ This will download the models with the resume option using curl (allowing it to ## Features - ### AUTOMATIC1111 [AUTOMATIC1111's fork](https://github.com/AUTOMATIC1111/stable-diffusion-webui) is imho the most feature rich yet elegant UI: @@ -63,13 +62,22 @@ Screenshots: ### lstein -[lstein's fork](https://github.com/lstein/stable-diffusion) is very mature when it comes to the cli, but less so for the WebUI. +[lstein's fork](https://github.com/lstein/stable-diffusion) is very mature when it comes to the cli, and the WebUI has potential. + +| Text to image | Image to image | Extras | +| ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | +| ![](https://user-images.githubusercontent.com/24505302/190662506-dabdc967-93af-4d78-8533-394604d29ba4.jpg) | ![](https://user-images.githubusercontent.com/24505302/190662557-7640d9f0-30d8-4527-97b0-07d3f48108d4.jpg) | ![](https://user-images.githubusercontent.com/24505302/190662588-37a01fad-f993-4674-9ae6-8714aa229f7b.jpg) | ## Setup & Usage Visit the wiki for [Setup](https://github.com/AbdBarho/stable-diffusion-webui-docker/wiki/Setup) and [Usage](https://github.com/AbdBarho/stable-diffusion-webui-docker/wiki/Usage) instructions, checkout the [FAQ](https://github.com/AbdBarho/stable-diffusion-webui-docker/wiki/FAQ) page if you face any problems, or create a new issue! ## Contributing + +Contributions are welcome! create an issue first of what you want to contribute (before you implement anything) so we can talk about it. + +## Contributing + Contributions are welcome! create an issue first of what you want to contribute (before you implement anything) so we can talk about it. ## Disclaimer diff --git a/docker-compose.yml b/docker-compose.yml index 5b09738..ae5cd42 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -54,3 +54,6 @@ services: <<: *base_service profiles: [ "lstein" ] build: ./services/lstein/ + environment: + - PRELOAD=false + - CLI_ARGS= diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile index f2dd4c2..3b8e035 100644 --- a/services/AUTOMATIC1111/Dockerfile +++ b/services/AUTOMATIC1111/Dockerfile @@ -41,7 +41,8 @@ RUN pip install --prefer-binary --no-cache-dir -r ${ROOT}/repositories/CodeForme # 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=91c56c51c7c83e18adb8fc52a950ec481c93b1de + +ARG SHA=7fe00d08402b8bf9f7f0ffef59ee3f3ad0187cfc RUN <', """ + GitHub site, Deployed with stable-diffusion-webui-docker +""", 1) +) diff --git a/services/lstein/mount.sh b/services/lstein/mount.sh new file mode 100755 index 0000000..ef36444 --- /dev/null +++ b/services/lstein/mount.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +set -eu + +ROOT=/stable-diffusion + +mkdir -p "${ROOT}/models/ldm/stable-diffusion-v1/" +ln -sf /cache/models/model.ckpt "${ROOT}/models/ldm/stable-diffusion-v1/model.ckpt" + +if test -f /cache/models/GFPGANv1.3.pth; then + base="${ROOT}/src/gfpgan/experiments/pretrained_models/" + mkdir -p "${base}" + ln -sf /cache/models/GFPGANv1.3.pth "${base}/GFPGANv1.3.pth" + echo "Mounted GFPGANv1.3.pth" +fi + +# facexlib +FACEX_WEIGHTS=/opt/conda/lib/python3.8/site-packages/facexlib/weights + +rm -rf "${FACEX_WEIGHTS}" +mkdir -p /cache/weights +ln -sf -T /cache/weights "${FACEX_WEIGHTS}" + +if "${PRELOAD}" == "true"; then + python3 -u scripts/preload_models.py +fi