Mirrors/stable-diffusion-webui-docker
0
0
Fork 0
mirror of https://github.com/AbdBarho/stable-diffusion-webui-docker.git synced 2025-11-13 23:42:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix overwriting existing values in config.json in auto (#418)

Browse Source 
`jq` merge direction in this case is right to left so if the user had
set up custom paths it would replace them with the default ones.

This PR switches the direction to use the defaults as fallback instead
of overwriting user settings.

----
Didn't want to create an issue for the tiny change.

Thanks for your work on the repo, it saved me a lot of time, 👍

---------

Co-authored-by: AbdBarho <ka70911@gmail.com>
This commit is contained in:
Mat
2023-05-06 07:38:36 +02:00
committed by GitHub
parent a68734c9f9
commit 9ac33db795
4 changed files with 84 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/AUTOMATIC1111/entrypoint.sh
View File

@@ -8,8 +8,8 @@ mkdir -p /data/config/auto/scripts/
find "${ROOT}/scripts/" -maxdepth 1 -type l -delete
cp -vrfTs /data/config/auto/scripts/ "${ROOT}/scripts/"
cp -n /docker/config.json /data/config/auto/config.json
jq '. * input' /data/config/auto/config.json /docker/config.json | sponge /data/config/auto/config.json
# Set up config file
python /docker/config.py /data/config/auto/config.json
if [ ! -f /data/config/auto/ui-config.json ]; then
echo '{}' >/data/config/auto/ui-config.json