Add swarmui and some fixes

.dockerignore

@@ -0,0 +1,11 @@
+.devscripts
+.github
+.vscode
+.idea
+.editorconfig
+.gitattributes
+.gitignore
+*.md
+docs
+data
+output

.github/workflows/docker.yml

@@ -12,12 +12,66 @@ jobs:
   build:
     strategy:
       matrix:
-        profile:
-          - auto
-          - comfy
-          - download
+        include:
+        -  image: simonmcnair/AUTOMATIC1111
+           dockerfile: services/AUTOMATIC1111/Dockerfile
+           context: services/AUTOMATIC1111/
+
+   #     -  image: simonmcnair/AUTOMATIC1111-rocm
+   #        dockerfile: services/AUTOMATIC1111/Dockerfile.rocm
+   #        context: services/AUTOMATIC1111/
+
+        -  image: simonmcnair/comfy
+           dockerfile: services/comfy/Dockerfile
+           context: services/comfy/
+
+        -  image: simonmcnair/download
+           dockerfile: services/download/Dockerfile
+           context: services/download/
+
+        -  image: simonmcnair/fooocus
+           dockerfile: services/fooocus/Dockerfile
+           context: services/fooocus/
+
+        -  image: simonmcnair/forge
+           dockerfile: services/forge/Dockerfile
+           context: services/forge/
+
+        -  image: simonmcnair/reforge
+           dockerfile: services/reforge/Dockerfile
+           context: services/reforge/
+
     runs-on: ubuntu-latest
     name: ${{ matrix.profile }}
     steps:
-      - uses: actions/checkout@v3
-      - run: docker compose --profile ${{ matrix.profile }} build --progress plain
+     # - uses: actions/checkout@v3
+     # - run: docker compose --profile ${{ matrix.profile }} build --progress plain
+
+       -  name: Checkout
+          uses: actions/checkout@v3
+       -  name: Set up QEMU
+          uses: docker/setup-qemu-action@v1
+       -  name: Set up Docker Buildx
+          uses: docker/setup-buildx-action@v1
+       -  name: Login to DockerHub
+          uses: docker/login-action@v1 
+          with:
+             username: ${{ secrets.DOCKER_HUB_USERNAME }}
+             password: ${{ secrets.DOCKER_HUB_TOKEN }} 
+       -  name: Extract metadata (tags, labels) for Docker
+          id: meta
+          uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+          with:
+             images: ${{ matrix.image }}
+       -  name: Build and push Docker image
+          uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+          with:
+             context: ${{ matrix.context }}
+             file: ${{ matrix.dockerfile }}
+             push: true
+             #This is needed because it is called main instead of master to get the latest tag in docker
+            # tags: |
+                # set latest tag for default branch
+            #    type=raw,value=latest,enable={{is_default_branch}}
+             tags: ${{ steps.meta.outputs.tags }}
+             labels: ${{ steps.meta.outputs.labels }}

.gitignore

@@ -4,3 +4,5 @@
 # VSCode specific
 *.code-workspace
 /.vscode
+.idea
+TODO.md

README.md

@@ -1,3 +1,18 @@
+I have forked this as AbdBarho hasn't been around for a while.  I'm not great with git, Linux , docker or stable diffusion but I manage to get along a bit.  Slowly.  with more commits than it takes.
+
+I am happy to look at PR's as and when.  Also happy to pass this back, as and whe, and if, they return.
+
+supports:
+- AUTOMATIC1111
+- comfy
+- fooocus
+- forge
+- reforge
+- swarmui _**(be aware comfyui backend can take some time to start, up to a minute or 2)**_
+
+#### TODOs
+1. [ ] Fix [Warning] [ComfyUI-0/STDERR] NameError: name 'NODE_CLASS_MAPPINGS' is not defined
+
 # Stable Diffusion WebUI Docker
 
 Run Stable Diffusion on your machine with a nice UI without any hassle!
@@ -26,6 +41,14 @@ This repository provides multiple UIs for you to play around with stable diffusi
 | -------------------------------------------------------------------------------- |
 | ![](https://github.com/comfyanonymous/ComfyUI/raw/master/comfyui_screenshot.png) |
 
+### [Fooocus](https://github.com/comfyanonymous/ComfyUI)
+
+[Full feature list here](https://github.com/lllyasviel/Fooocus#fooocus), Screenshot:
+
+| Simplified UI                                                                    |
+| -------------------------------------------------------------------------------- |
+| ![](https://github.com/lllyasviel/Fooocus/assets/19834515/483fb86d-c9a2-4c20-997c-46dafc124f25) |
+
 ## Contributing
 
 Contributions are welcome! **Create a discussion first of what the problem is and what you want to contribute (before you implement anything)**

data/.gitignore

@@ -1,4 +1,2 @@
-/.cache
-/config
-/embeddings
-/models
+/*
+!/.gitignore

docker-compose.yml

@@ -1,18 +1,33 @@
 x-base_service: &base_service
-    ports:
-      - "${WEBUI_PORT:-7860}:7860"
-    volumes:
-      - &v1 ./data:/data
-      - &v2 ./output:/output
     stop_signal: SIGKILL
     tty: true
+    restart: unless-stopped
     deploy:
       resources:
+#        limits:
+#          cpus: 8
+#          memory: 48G
         reservations:
+#          cpus: 4
+#          memory: 24G
           devices:
               - driver: nvidia
                 device_ids: ['0']
-                capabilities: [compute, utility]
+                capabilities: [compute, utility, gpu]
+
+x-defaults: &defaults
+    <<: *base_service
+    ports:
+      - "${WEBUI_PORT:-7860}:7860"
+    volumes:
+      - &v1 ./data:/data
+      - &v2 ./output:/output
+
+x-auto_service: &auto_service
+    <<: *defaults
+    container_name: auto
+    build: ./services/AUTOMATIC1111
+    image: sd-auto:78
 
 name: webui-docker
 
@@ -23,33 +38,119 @@ services:
     volumes:
       - *v1
 
-  auto: &automatic
-    <<: *base_service
+  auto:
+    <<: *auto_service
     profiles: ["auto"]
-    build: ./services/AUTOMATIC1111
-    image: sd-auto:78
     environment:
       - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api
 
   auto-cpu:
-    <<: *automatic
+    <<: *auto_service
     profiles: ["auto-cpu"]
     deploy: {}
     environment:
       - CLI_ARGS=--no-half --precision full --allow-code --enable-insecure-extension-access --api
 
+  auto-full:
+    <<: *auto_service
+    profiles: [ "full" ]
+    environment:
+      - CLI_ARGS=--allow-code --xformers --enable-insecure-extension-access --no-half-vae --api
+
+  auto-rocm:
+    <<: *auto_service
+    profiles: ["auto-rocm"]
+    container_name: auto-rocm
+    build:
+      context: ./services/AUTOMATIC1111
+      dockerfile: ROCM.dockerfile
+    devices:
+      - "/dev/kfd"
+      - "/dev/dri"
+    deploy: {}
+    environment:
+      - CLI_ARGS=--allow-code --medvram --enable-insecure-extension-access --api
+
   comfy: &comfy
     <<: *base_service
     profiles: ["comfy"]
-    build: ./services/comfy/
+    container_name: comfy
+    build: ./services/comfy
     image: sd-comfy:7
+    volumes:
+      - ./data/models:/opt/comfyui/models
+      - ./data/models/configs:/opt/comfyui/user/default/
+      - ./data/config/comfy/custom_nodes:/opt/comfyui/custom_nodes
+      - ./output/comfy:/opt/comfyui/output
+    ports:
+      - "${COMFYUI_PORT:-7861}:7861"
     environment:
+      - COMFYUI_PATH=/opt/comfyui
+      - COMFYUI_MODEL_PATH=/opt/comfyui/models
       - CLI_ARGS=
-
+#      - TORCH_FORCE_NO_WEIGHTS_ONLY_LOAD=1
 
   comfy-cpu:
     <<: *comfy
     profiles: ["comfy-cpu"]
     deploy: {}
+    ports:
+      - "${COMFYUI_PORT:-7861}:7861"
     environment:
       - CLI_ARGS=--cpu
+
+  swarmui:
+    <<: *base_service
+    profiles: ["swarmui"]
+    container_name: swarmui
+    build: ./services/swarmui
+    image: sd-swarmui
+    ports:
+      - "${SWARMUI_PORT:-7801}:7801"
+    volumes:
+      - ./data/swarmui:/SwarmUI/Data
+      - ./data/models:/SwarmUI/Models
+      - ./data/embeddings:/SwarmUI/Models/Embeddings
+# comfyui
+      - ./data/config/comfy/custom_nodes:/SwarmUI/dlbackend/ComfyUI/custom_nodes
+#      - ./data/models/configs:/SwarmUI/dlbackend/ComfyUI/user/default/ # TODO rm old
+      - ./data/config/configs:/SwarmUI/dlbackend/ComfyUI/user/default/
+# output
+      - ./output/swarmui:/SwarmUI/Output
+      - ./output/swarmui/comfy:/SwarmUI/dlbackend/ComfyUI/output
+    environment:
+      - COMFYUI_PATH=/opt/comfyui
+      - COMFYUI_MODEL_PATH=/opt/comfyui/models
+
+  reforge: &reforge
+    <<: *base_service
+    profiles: ["reforge"]
+    build: ./services/reforge
+    image: sd-reforge:80
+    environment:
+      - CLI_ARGS=--allow-code --xformers --enable-insecure-extension-access --api --pin-shared-memory --cuda-malloc --cuda-stream
+
+  forge: &forge
+    <<: *base_service
+    profiles: ["forge"]
+    build: ./services/forge
+    image: sd-forge:80
+    environment:
+      - CLI_ARGS=--allow-code --xformers --enable-insecure-extension-access --api --pin-shared-memory --cuda-malloc --cuda-stream
+
+  fooocus: &fooocus
+    <<: *base_service
+    profiles: ["fooocus"]
+    build: ./services/fooocus/
+    image: sd-fooocus:3
+    environment:
+      - CLI_ARGS=
+
+# TODO rm old
+#  convertor:
+#    <<: *base_service
+#    profiles: [ "convert" ]
+#    build: ./services/convert2safetensors
+#    image: sd-convert
+#    volumes:
+#      - ./data/convert:/opt/convert2safetensors/models

docs/FAQ.md

@@ -0,0 +1,72 @@
+# General
+
+Unfortunately, AMD GPUs [#63](https://github.com/AbdBarho/stable-diffusion-webui-docker/issues/63) and MacOs [#35](https://github.com/AbdBarho/stable-diffusion-webui-docker/issues/35) are not supported, contributions to add support are very welcome.
+
+## `auto` exists with error code 137
+
+This is an indicator that the container does not have enough RAM, you need at least 12GB, recommended 16GB.
+
+You might need to [adjust the size of the docker virtual machine RAM](https://github.com/AbdBarho/stable-diffusion-webui-docker/issues/296#issuecomment-1480318829) depending on your OS.
+
+## Dockerfile parse error
+```
+Error response from daemon: dockerfile parse error line 33: unknown instruction: GIT
+ERROR: Service 'model' failed to build : Build failed
+```
+Update docker to the latest version, and make sure you are using `docker compose` instead of `docker-compose`. [#16](https://github.com/AbdBarho/stable-diffusion-webui-docker/issues/16), also, try setting the environment variable `DOCKER_BUILDKIT=1`
+
+## Unknown Flag `--profile`
+
+Update docker to the latest version, and see [this comment](https://github.com/AbdBarho/stable-diffusion-webui-docker/issues/165#issuecomment-1296155667), try setting the environment variable mentioned in the previous point.
+
+## Output is a always green image
+use `--precision full --no-half`. [#9](https://github.com/AbdBarho/stable-diffusion-webui-docker/issues/9)
+
+
+## Found no NVIDIA driver on your system even though the drivers are installed and `nvidia-smi` shows it
+
+add `NVIDIA_DRIVER_CAPABILITIES=compute,utility` and `NVIDIA_VISIBLE_DEVICES=all` to container can resolve this problem [#348](https://github.com/AbdBarho/stable-diffusion-webui-docker/issues/348#issuecomment-1449250332)
+
+
+---
+
+# Linux
+
+### Error response from daemon: could not select device driver "nvidia" with capabilities: `[[gpu]]`
+
+Install [NVIDIA Container Toolkit](https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/latest/install-guide.html) and restart the docker service [#81](https://github.com/AbdBarho/stable-diffusion-webui-docker/issues/81) 
+
+
+### `docker compose --profile auto up --build` fails with `OSError`
+
+This might be related to the `overlay2` storage driver used by docker overlayed on zfs, change to the `zfs` storage driver [#433](https://github.com/AbdBarho/stable-diffusion-webui-docker/issues/433#issuecomment-1694520689)
+
+---
+
+# Windows / WSL
+
+
+## Build fails at [The Shell command](https://github.com/AbdBarho/stable-diffusion-webui-docker/blob/5af482ed8c975df6aa0210225ad68b218d4f61da/build/Dockerfile#L11), `/bin/bash` not found in WSL.
+
+Edit the corresponding docker file, and change the SHELL from `/bin/bash` to `//bin/bash` [#21](https://github.com/AbdBarho/stable-diffusion-webui-docker/issues/21), note: this is a hack and something in your wsl is messed up.
+
+
+## Build fails with credentials errors when logged in via SSH on WSL2/Windows
+You can try forcing plain text auth creds storage by removing line with "credStore" from ~/.docker/config.json (in WSL). [#56](https://github.com/AbdBarho/stable-diffusion-webui-docker/issues/56)
+
+## `unable to access 'https://github.com/...': Could not resolve host: github.com` or any domain
+Set the `build/network` of the service you are starting to `host` [#114](https://github.com/AbdBarho/stable-diffusion-webui-docker/issues/114#issue-1393683083)
+
+## Other build errors on windows
+* Make sure:
+   * Windows 10 release >= 2021H2 (required for WSL to see the GPU)
+   * WSL2 (check with `wsl -l -v`)
+   * Latest Docker Desktop
+* You might need to create a [`.wslconfig`](https://docs.microsoft.com/en-us/windows/wsl/wsl-config#example-wslconfig-file) and increase memory, if you have 16GB RAM, set the limit to something around 12GB, [#34](https://github.com/AbdBarho/stable-diffusion-webui-docker/issues/34) [#64](https://github.com/AbdBarho/stable-diffusion-webui-docker/issues/64)
+* You might also need to [force wsl to allow file permissions](https://superuser.com/a/1646556)
+
+---
+
+# AWS
+
+You have to use one of AWS's GPU-enabled VMs and their Deep Learning OS images. These have the right divers, the toolkit and all the rest already installed and optimized. [#70](https://github.com/AbdBarho/stable-diffusion-webui-docker/issues/70)

docs/Home.md

@@ -0,0 +1 @@
+Welcome to the stable-diffusion-webui-docker wiki!