Commit Graph

95 Commits

Author SHA1 Message Date
Mat 9ac33db795 Fix overwriting existing values in config.json in auto (#418)
`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>
2023-05-06 07:38:36 +02:00
AbdBarho 0e5801e9d6 Update auto to pytorch 2 (#442)
Closes #410
2023-05-04 22:41:51 +02:00
AbdBarho 2efaeb41cd Add styles.csv support (#440)
Follow up to #386 after
https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/9334 has
been merged.

Closes #435
2023-05-04 07:48:19 +02:00
AbdBarho 56b942237e Update Auto (#379)
Last version before pytorch 2


https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/5ab7f213bec2f816f9c5644becb32eb72c8ffb89
2023-05-04 07:29:49 +02:00
AbdBarho 7b8bc3d74a LyCORIS - ModelScope (#439)
Follow up to #401

Closes #401
Closes #437

---------

Co-authored-by: svupper <56261963+svupper@users.noreply.github.com>
Co-authored-by: Ubuntu <ubuntu@ip-10-123-2-162.eu-west-3.compute.internal>
2023-05-04 06:55:01 +02:00
AJ Walter 555c26b7ce Make Dockerfiles OCI compliant (#408)
## Justification

Closes issue #352

This update makes the Dockerfiles OCI compliant, making it easier to use
Buildah or other image building techniques that require it

## Implementation

This changes a few things, listed below:

* auto: Download container is switched to alpine. The `git` container
specified the `/git` directory as a volume. As such, all the files under
`/git` would be lost after each script invoke. Alpine is used later in
the build process anyway, so it shouldn't be any extra cost to switch to
it
* auto: "New" clone.sh script is copied into the container, which is
basically just the previous clone script that was embedded in the
Dockerfile.
* all: `<<EOF` heredoc styles have been switched to `&& \`
* all: I added NVIDIA_DRIVER_CAPABILITIES and NVIDIA_VISIBLE_DEVICES to
expose my Nvidia card. This is most likely a selinux/podman problem, but
shouldn't change anything with docker to add it.
* docker-compose: I added selinux labeling. I tested this with real
docker (not just podman!) and it seems to work fine. Though I suggest
you try it too.

## Testing

Locally builds with buildah. 

Note: for caching to work properly, you still need to replace
`/root/.cache/pip` with `/root/.cache/pip,Z` on selinux systems.

Note: I was having some trouble running invoke. Thought it was this PR,
but it's a known issue. See
https://github.com/invoke-ai/InvokeAI/issues/3182

---------

Co-authored-by: AbdBarho <ka70911@gmail.com>
2023-04-16 10:32:03 +02:00
Simon Oelerich 5d379bf7bc Add mounts for openpose (#387)
Upon enabling the ControlNet addon from
https://github.com/AbdBarho/stable-diffusion-webui-docker/pull/385 one
might want to use the `openpose` preprocessors. Those are downloaded by
the addon the first time they are used. Without proper mounts those
networks will be downloaded on usage after each container start.
This PR enables those mounts to reduce data traffic.
2023-04-05 19:09:07 +02:00
Simon Oelerich d2c1e551d7 Enable ControlNet mounts for AUTOMATIC1111 (#385)
The ControlNet addon
[sd-webui-controlnet](https://github.com/Mikubill/sd-webui-controlnet)
requires the `data/ControlNet` folder to be mounted into
`models/ControlNet`.
This PR enables said mount and adds the ControlNet folder to
`.gitignore` file.

---------

Co-authored-by: AbdBarho <ka70911@gmail.com>
2023-04-04 18:55:14 +02:00
AbdBarho 063665eae1 Update Auto (#365)
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/a9fed7c364061ae6efb37f797b6b522cb3cf7aa2
2023-03-14 18:30:08 +01:00
AbdBarho bb54e89b34 Update Auto (#363)
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/27e319dc4f09a2f040043948e5c52965976f8491
2023-03-11 22:35:11 +01:00
AbdBarho b36de9ef2b Add libgoogle-perftools-dev (#341)
- auto:
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/0cc0ee1bcb4c24a8c9715f66cede06601bfc00c8

Closes #326
2023-02-23 21:50:16 +01:00
AbdBarho 70d8d7f37f Update versions (#338)
- auto:
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/076d624a297532d6e4abebe5807fd7c7504d7a73
- invoke:
https://github.com/invoke-ai/InvokeAI/commit/d3c1b747ee1632c6fab81ba9f89314e9fbdd55e4
2023-02-19 16:25:06 +01:00
AbdBarho 67c9d118d9 Update versions (#332)
### Update versions

- auto:
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/3715ece0adce7bf7c5e9c5ab3710b2fdc3848f39
- invoke:
https://github.com/invoke-ai/InvokeAI/commit/6551527fe249dc7a44e3fab9db9451c0dc3ad851

Update xformers
2023-02-17 09:22:34 +01:00
AbdBarho 2829ef3581 Auto: hot fix fastapi (#328)
Closes #327
2023-02-11 11:13:41 +01:00
AbdBarho 1e0561c5cb Update Auto (#323)
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/3993aa43e95bb60b9df977946af988f119525a71
2023-02-05 11:04:32 +01:00
AbdBarho 3c860d6eaa Update versions (#320)
- auto:
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/226d840e84c5f306350b0681945989b86760e616
- invoke:
https://github.com/invoke-ai/InvokeAI/commit/80c5322cccc6f9c6f77aaea80b4bb95e25bc05ba


Remove `accelerate` for startup. Refs #317 

Use `SIGINT` Fixes #319
2023-02-02 19:53:48 +01:00
AbdBarho 15e9841860 Update versions (#316)
- auto:
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/00dab8f10defbbda579a1bc89c8d4e972c58a20d
- invoke:
https://github.com/invoke-ai/InvokeAI/commit/07e03b31b7610a27d709b366a491e57085d9b393
2023-01-29 20:07:41 +01:00
AbdBarho eeb410f2de Update versions (#315)
auto:
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/7a14c8ab45da8a681792a6331d48a88dd684a0a9
invoke:
https://github.com/invoke-ai/InvokeAI/commit/e4cd66216e0b941de7f27b4e2e260aa4f8c956e7

Also, fix script mounting in auto #295
2023-01-27 07:55:22 +01:00
AbdBarho 9d2a3388c3 Always serve static files (#314)
#308
2023-01-25 18:17:10 +01:00
AbdBarho 95e489afec Revert #309 (#313)
Closes #312
2023-01-25 17:38:25 +01:00
AbdBarho 00518a0340 Add missing mkdir (#310) 2023-01-24 23:25:07 +01:00
AbdBarho f8de9190ed Sync Scripts (#309)
Refs #308
2023-01-24 23:11:15 +01:00
AbdBarho 8713163a3c Update Auto (#307)
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/93fad28a979727f9b1331dbdc447598824057cdc
2023-01-24 19:52:15 +01:00
AbdBarho e2b0fb905b Add Lora support (#306)
Refs #305 #303

Co-authored-by: repligator <114337591+repligator@users.noreply.github.com>
2023-01-24 19:17:34 +01:00
AbdBarho 510f9fab2b Update versions (#302)
Closes #301 

- auto:
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/c98cb0f8ecc904666f47684e238dd022039ca16f
- invoke:
https://github.com/invoke-ai/InvokeAI/commit/89791d91e84abfc127ffecca21db68920781709f
2023-01-22 20:32:03 +01:00
AbdBarho 042d5c561c Fix link / mkdir order (#299)
Fixes
https://github.com/AbdBarho/stable-diffusion-webui-docker/commit/c9153faff74a954fdb3de6289a6e6e5b78aa01a3#commitcomment-97285124
2023-01-19 06:37:53 +01:00
AbdBarho 66846377a6 Mount scripts instead of copy (#298)
Refs #295
2023-01-18 18:50:56 +01:00
AbdBarho c9153faff7 Update versions (#297)
- auto:
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/6faae2323963f9b0e0086a85b9d0472a24fbaa73
- invoke:
https://github.com/invoke-ai/InvokeAI/commit/f232068ab89bd80e4f5f3133dcdb62ea78f1d0f7
2023-01-18 18:48:34 +01:00
AbdBarho 13dfd4eba5 Update auto (#293)
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/d97f467c0d27695d23edad5e4f8898a57e0ccb00

This version has a hash computation of models, so expect slower start up
& loading times.
2023-01-15 11:50:16 +01:00
AbdBarho 9b1ea3cacf [MAJOR] Update auto to torch 1.13.1 (#290)
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/82725f0ac439f7e3b67858d55900e95330bbd326

torch==1.13.1+cu117

This might break your extensions!
2023-01-13 21:27:55 +01:00
AbdBarho b5cdf299ca Update versions (#287)
- auto:
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/2b94ec78869db7d2beaad23bdff47340416edf85
- sygil:
https://github.com/Sygil-Dev/sygil-webui/commit/571fb897edd58b714bb385dfaa1ad59aecef8bc7
2023-01-09 19:04:40 +01:00
AbdBarho db831ece65 Bump versions (#286)
- auto:
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/151233399c4b79934bdbb7c12a97eeb6499572fb
- invoke:
https://github.com/invoke-ai/InvokeAI/commit/26e413ae9cf8dc04c617ca451a91a1624bfdf0c0
2023-01-07 18:58:50 +01:00
AbdBarho ceeac61cb0 Update auto (#282)
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/683287d87f6401083a8d63eedc00ca7410214ca1
2023-01-06 10:24:20 +01:00
AbdBarho 19972f3cac Update Versions (#281)
- auto:
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/81490780949fffed77493b4bd741e96ec737fe27
- sygil:
https://github.com/Sygil-Dev/sygil-webui/commit/e48482823bb73697a6f1e39b3a7e47fe2ba1d697
- invoke:
https://github.com/invoke-ai/InvokeAI/commit/21bf512056eb7bc883174a4203011105fc1b8b50
2023-01-04 20:36:49 +01:00
AbdBarho 0c16c105bc Update auto (#280)
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/3e22e294135ed0327ce9d9738655ff03c53df3c0
2023-01-03 21:19:37 +01:00
AbdBarho 78c90e5435 Update auto & invoke (#277)
- auto:
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/524d532b387732d4d32f237e792c7f201a934400
- invoke:
https://github.com/invoke-ai/InvokeAI/commit/524d532b387732d4d32f237e792c7f201a934400

Happy new Year!!!
2023-01-01 16:46:41 +01:00
AbdBarho 6a3826c80a Update auto (#274)
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/4af3ca5393151d61363c30eef4965e694eeac15e

Merry Christmas 🎄
2022-12-26 09:50:29 +01:00
AbdBarho 56d9763a73 Smaller xformers wheel (#271)
Built with `Release` instead of `RelWithDebInfo`

Related #270
2022-12-22 09:19:39 +01:00
AbdBarho 41e0dcc2f6 Auto: clean up interrogators (#265) 2022-12-17 12:22:45 +01:00
AbdBarho d97d257fd3 Update versions (#257)
- auto:
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/685f9631b56ff8bd43bce24ff5ce0f9a0e9af490
- sygil:
https://github.com/Sygil-Dev/sygil-webui/commit/d3f9d054e8203bd56a6a1712227eac41bef2f291
- invoke:
https://github.com/invoke-ai/InvokeAI/commit/e159bb3dceb26d1bc3ab12f249e4ef4669fa1584
2022-12-12 09:25:44 +01:00
AbdBarho 8201e361fa Alpha support for sd v2.x in auto (#244)
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/44c46f0ed395967cd3830dd481a2db759fda5b3b

Install sd 2 from [these
instructions](https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Features#stable-diffusion-20),
put the downloaded files in `data/StableDiffusion/`, maybe create a
subfolder `v2` and put the models in it, just to keep everything clean.

There will be problems, so be warry.
2022-12-09 18:14:48 +01:00
AbdBarho 87a51e9fd1 [BREAKING] Rename UIs (#254)
Rename the UIs in docker compose to their new names

Changes folder names

Changes output folder structure

Closes issue #263

Adds `sygil-sl` instead of docker compose flag.
2022-12-04 11:00:28 +01:00
AbdBarho f1a1641add Invoke 2.2.3 (#250)
lstein:
https://github.com/invoke-ai/InvokeAI/commit/5c31feb3a1096d437c94b6e1c3224eb7a7224a85
2022-12-03 13:36:18 +01:00
AbdBarho d20b8732b3 Update xformers (#241)
https://github.com/facebookresearch/xformers/commit/8910bb5a6536e01b49f4b85e01868970bfea7850
2022-11-25 13:25:10 +01:00
AbdBarho 9e7979b756 Update Versions (#230)
- auto:
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/47a44c7e421b98ca07e92dbf88769b04c9e28f86
- hlky:
https://github.com/sd-webui/stable-diffusion-webui/commit/269107a104fc9fee3201eb2c56cf7adb3d063e4b


Refs #216
2022-11-20 11:05:39 +01:00
AbdBarho 9b6750b2f6 Use cuda 11.6 for auto (#220)
auto:
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/98947d173e3f1667eba29c904f681047dea9de90

Closes #218 #219
2022-11-13 07:12:17 +01:00
AbdBarho 53ac3601d7 Update versions (#213)
- auto:
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/ac085628540d0ec6a988fad93f5b8f2154209571
- hlky:
https://github.com/sd-webui/stable-diffusion-webui/commit/09b64d4f759c44c7c6bc4d433ddd8e964d48b854
- lstein
  - On hold because of many breaking changes
2022-11-11 07:19:47 +01:00
AbdBarho 427320475b Add Samplers (#205)
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/804d9fb83d0c63ca3acd36378707ce47b8f12599

Closes #201 
Closes #204
2022-11-07 07:02:31 +01:00
AbdBarho 0a4c2a34b8 Hack to allow installing extensions (#200)
remember to remove it if its fixed upstream
2022-11-05 18:04:39 +01:00
AbdBarho 73cd69075e Update versions (#198)
- auto:
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/30b1bcc64e67ad50c5d3af3a6fe1bd1e9553f34e
- hlky:
https://github.com/sd-webui/stable-diffusion-webui/commit/6f6d7571ea56809c1beaf11430ec36ab28e0884f
2022-11-05 09:51:30 +01:00