6 commits

Author	SHA1	Message	Date
Floatingghost	5fc47d4b80	i am a moron	2024-05-28 12:15:10 +01:00
floatingghost	e36c0f96fc	Merge pull request 'Add docker override file to docs and gitignore' (#621) from norm/akkoma:docker-compose-override into develop ... Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/621	2024-04-12 18:50:25 +00:00
Koneko Toujou	1b9edcba64	Add shm_size to the Database container	2023-08-21 21:50:10 +00:00
Norm	0cb3812ac0	Add docker override file to docs and gitignore ... The docker-compose.yml file is likely to be edited quite extensively by admins when setting up an instance. This would likely cause problems when dealing with updating Akkoma as merge conflicts would likely occur. Docker-compose already has the ability to use override files in addition to the main `docker-compose.yml` file. Admins can instead put any overrides (additional volumes, container for elasticsearch, etc.) into a file that won't be tracked by git and thus won't run into merge conflicts in the future. In particular, the `docker-compose.override.yml` will be checked by docker compose in addition to the main file if it exists and override definitions from the latter with the former.	2023-08-07 13:09:04 -04:00
FloatingGhost	5231d436d1	Add docker migration guide	2022-10-18 16:16:55 +01:00
floatingghost	66f913355a	Docker builds (#231) ... Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/231	2022-10-16 19:25:54 +00:00