Merge remote-tracking branch 'refs/remotes/upstream/master' into merge

# Conflicts:
#	docker-compose.yml
#	services/AUTOMATIC1111/Dockerfile
#	services/comfy/Dockerfile
#	services/comfy/entrypoint.sh
This commit is contained in:
fapoverflow 2025-08-02 03:56:32 +02:00
commit f7f2d900d9
20 changed files with 984 additions and 17 deletions

View file

@ -41,6 +41,39 @@ 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"]