unified prefix, less options

This commit is contained in:
Mat 2023-05-24 08:11:41 +02:00
parent 9860307ca9
commit c2f5033a9d
No known key found for this signature in database
GPG key ID: 120EBFC87CE63728
3 changed files with 19 additions and 28 deletions

2
.gitignore vendored
View file

@ -2,7 +2,7 @@
/docker-compose.override.yml /docker-compose.override.yml
# Environment variable files # Environment variable files
.env .env*
# VSCode specific # VSCode specific
*.code-workspace *.code-workspace

View file

@ -2,10 +2,10 @@ version: "3.9"
x-base_service: &base_service x-base_service: &base_service
ports: ports:
- "${HOST_PORT:-7860}:7860" - "${WEBUI_PORT:-7860}:7860"
volumes: volumes:
- &v1 "${HOST_DATA_VOL:-./data}:/data" - &v1 "${WEBUI_DATA_VOL:-./data}:/data"
- &v2 "${HOST_OUT_VOL:-./output}:/output" - &v2 "${WEBUI_OUT_VOL:-./output}:/output"
stop_signal: SIGINT stop_signal: SIGINT
deploy: deploy:
resources: resources:
@ -30,14 +30,14 @@ services:
build: ./services/AUTOMATIC1111 build: ./services/AUTOMATIC1111
image: sd-auto:56 image: sd-auto:56
environment: environment:
- CLI_ARGS=${AUTO_CLI_ARGS:-"--allow-code --medvram --xformers --enable-insecure-extension-access --api"} - CLI_ARGS=${WEB_UI_ARGS:-"--allow-code --medvram --xformers --enable-insecure-extension-access --api"}
auto-cpu: auto-cpu:
<<: *automatic <<: *automatic
profiles: ["auto-cpu"] profiles: ["auto-cpu"]
deploy: {} deploy: {}
environment: environment:
- CLI_ARGS=${AUTO_CPU_CLI_ARGS:-"--no-half --precision full --allow-code --enable-insecure-extension-access --api"} - CLI_ARGS=${WEB_UI_ARGS:-"--no-half --precision full --allow-code --enable-insecure-extension-access --api"}
invoke: &invoke invoke: &invoke
<<: *base_service <<: *base_service
@ -46,14 +46,14 @@ services:
image: sd-invoke:28 image: sd-invoke:28
environment: environment:
- PRELOAD=true - PRELOAD=true
- CLI_ARGS=${INVOKE_CLI_ARGS:-"--xformers"} - CLI_ARGS=${WEB_UI_ARGS:-"--xformers"}
# invoke-cpu: # invoke-cpu:
# <<: *invoke # <<: *invoke
# profiles: ["invoke-cpu"] # profiles: ["invoke-cpu"]
# environment: # environment:
# - PRELOAD=true # - PRELOAD=true
# - CLI_ARGS=${INVOKE_CPU_CLI_ARGS:-"--always_use_cpu"} # - CLI_ARGS=${WEB_UI_ARGS:-"--always_use_cpu"}
comfy: &comfy comfy: &comfy
<<: *base_service <<: *base_service
@ -62,11 +62,11 @@ services:
image: sd-comfy:2 image: sd-comfy:2
tty: true tty: true
environment: environment:
- CLI_ARGS=${COMFY_CLI_ARGS:-""} - CLI_ARGS=${WEB_UI_ARGS:-""}
comfy-cpu: comfy-cpu:
<<: *comfy <<: *comfy
profiles: ["comfy-cpu"] profiles: ["comfy-cpu"]
deploy: {} deploy: {}
environment: environment:
- CLI_ARGS=${COMFY_CPU_CLI_ARGS:-"--cpu"} - CLI_ARGS=${WEB_UI_ARGS:-"--cpu"}

View file

@ -8,35 +8,26 @@
# Don't forget to move/copy the files to the new location, if you changed mounts # Don't forget to move/copy the files to the new location, if you changed mounts
# You can see the default values in docker-compose.yml # You can see the default values in docker-compose.yml
# For custom settings per profile you can use the command line to overwrite variables.
# It is also possible to use multiple .env files like .env-auto + .env-invoke and use the --env-file option.
# For more customisation use a docker-override.yml
# Delete your docker-override.yml and .env files to go back to defaults
########################## ##########################
### NETWORK ### ### NETWORK ###
########################## ##########################
## The port on your machine ## ## The port on your machine ##
#HOST_PORT=7860 #WEBUI_PORT=7860
##########################
### MOUNTS ###
##########################
## Models, settings and other persistent files ## Models, settings and other persistent files
#HOST_DATA_VOL=./data #WEBUI_DATA_VOL=./data
## Target path for generated images ## ## Target path for generated images ##
#HOST_OUT_VOL=./output #WEBUI_OUT_VOL=./output
########################## ##########################
### CONTAINER SETTINGS ### ### CONTAINER SETTINGS ###
########################## ##########################
## AUTO + AUTO using CPU ## #WEB_UI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api
#AUTO_CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api
#AUTO_CPU_CLI_ARGS=--no-half --precision full --allow-code --enable-insecure-extension-access --api
## Invoke + Invoke using CPU ##
#INVOKE_CLI_ARGS=--xformers
#INVOKE_CPU_CLI_ARGS=--always_use_cpu
## Comfy + Comfy using CPU ##
#COMFY_CLI_ARGS=
#COMFY_CPU_CLI_ARGS=--cpu