diff --git a/Docker-compose-build.yml b/Docker-compose-build.yml deleted file mode 100644 index 83073ea..0000000 --- a/Docker-compose-build.yml +++ /dev/null @@ -1,88 +0,0 @@ -x-base_service: &base_service - ports: - - "${WEBUI_PORT:-7860}:7860" - volumes: - - &v1 ./data:/data - - &v2 ./output:/output - stop_signal: SIGKILL - tty: true - deploy: - resources: - reservations: - devices: - - driver: nvidia - device_ids: ['0'] - capabilities: [compute, utility] -name: webui-docker -services: - download: - build: ./services/download/ - profiles: ["download"] - volumes: - - *v1 - auto: &automatic - <<: *base_service - profiles: ["auto"] - build: ./services/AUTOMATIC1111 - image: sd-auto:80 - environment: - - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api - - auto-rocm: - <<: *base_service - profiles: ["auto-rocm"] - build: - context: ./services/AUTOMATIC1111 - dockerfile: Dockerfile.rocm - devices: - - "/dev/kfd" - - "/dev/dri" - deploy: {} - environment: - - CLI_ARGS=--allow-code --medvram --enable-insecure-extension-access --api - - 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 - - auto-cpu: - <<: *automatic - profiles: ["auto-cpu"] - deploy: {} - environment: - - CLI_ARGS=--no-half --precision full --allow-code --enable-insecure-extension-access --api - - comfy: &comfy - <<: *base_service - profiles: ["comfy"] - build: ./services/comfy/ - image: sd-comfy:6 - environment: - - CLI_ARGS= - - comfy-cpu: - <<: *comfy - profiles: ["comfy-cpu"] - deploy: {} - environment: - - CLI_ARGS=--cpu - - fooocus: &fooocus - <<: *base_service - profiles: ["fooocus"] - build: ./services/fooocus/ - image: sd-fooocus:3 - environment: - - CLI_ARGS= diff --git a/README.md b/README.md index c973e68..2f449c7 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ supports: - fooocus - forge - reforge +- swarmui # Stable Diffusion WebUI Docker diff --git a/docker-compose.yml b/docker-compose.yml index 712a6fa..617545d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -41,39 +41,6 @@ services: environment: - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api -# TODO check docker image -# auto-rocm: -# <<: *base_service -# profiles: ["auto-rocm"] -# image: simonmcnair/automatic1111-rocm:master -# devices: -# - "/dev/kfd" -# - "/dev/dri" -# deploy: {} -# environment: -# - CLI_ARGS=--allow-code --medvram --enable-insecure-extension-access --api -# -# reforge: &reforge -# <<: *base_service -# profiles: ["reforge"] -# image: simonmcnair/reforge:master -# environment: -# - CLI_ARGS=--allow-code --xformers --enable-insecure-extension-access --api --pin-shared-memory --cuda-malloc --cuda-stream -# -# forge: &forge -# <<: *base_service -# profiles: ["forge"] -# image: simonmcnair/forge:master -# environment: -# - CLI_ARGS=--allow-code --xformers --enable-insecure-extension-access --api --pin-shared-memory --cuda-malloc --cuda-stream -# -# fooocus: &fooocus -# <<: *base_service -# profiles: ["fooocus"] -# image: simonmcnair/fooocus:master -# environment: -# - CLI_ARGS= - auto-cpu: <<: *auto_service profiles: ["auto-cpu"] @@ -89,6 +56,19 @@ services: environment: - CLI_ARGS=--allow-code --xformers --enable-insecure-extension-access --no-half-vae --api + auto-rocm: + <<: *base_service + profiles: ["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"] @@ -129,12 +109,38 @@ services: - ./data/swarmui:/SwarmUI/Data # - "backend:/app/dlbackend" - ./data/models:/SwarmUI/Models + - ./data/embeddings:/SwarmUI/Models/Embeddings - ./output/swarmui:/SwarmUI/Output - convertor: + reforge: &reforge <<: *base_service - profiles: [ "convert" ] - build: ./services/convert2safetensors - image: sd-convert - volumes: - - ./data/convert:/opt/convert2safetensors/models + 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 diff --git a/services/AUTOMATIC1111/Dockerfile.rocm b/services/AUTOMATIC1111/ROCM.dockerfile similarity index 100% rename from services/AUTOMATIC1111/Dockerfile.rocm rename to services/AUTOMATIC1111/ROCM.dockerfile