Commit Graph

6 Commits

Author SHA1 Message Date
Norm 0cb3812ac0
Add docker override file to docs and gitignore
ci/woodpecker/pr/build-amd64 Pipeline is pending Details
ci/woodpecker/pr/build-arm64 Pipeline is pending Details
ci/woodpecker/pr/docs Pipeline is pending Details
ci/woodpecker/pr/test Pipeline is pending Details
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
Norm 6674b33d75
update docs with new docker compose commands
ci/woodpecker/pr/woodpecker Pipeline is pending Details
2023-06-18 01:44:25 -04:00
@r3g_5z@plem.sapphic.site 565ead8397 minor-changes (#313)
ci/woodpecker/push/woodpecker Pipeline is pending Details
Only real change here is making MRF rejects log as debug instead of info (#234)

I don't know if it's the best way to do it, but it seems it's just MRF using this and almost always this is intended.

The rest are just minor docs changes and syncing the restricted nicknames stuff.

I compiled and ran my changes with Docker and they all work.

Co-authored-by: r3g_5z <june@terezi.dev>
Reviewed-on: #313
Co-authored-by: @r3g_5z@plem.sapphic.site <june@girlboss.ceo>
Co-committed-by: @r3g_5z@plem.sapphic.site <june@girlboss.ceo>
2022-11-26 19:27:58 +00:00
FloatingGhost 5231d436d1 Add docker migration guide
ci/woodpecker/push/woodpecker Pipeline was successful Details
2022-10-18 16:16:55 +01:00
FloatingGhost deba1d25f5 add DB restart to docker file
ci/woodpecker/push/woodpecker Pipeline is pending Details
2022-10-17 16:29:36 +01:00
floatingghost 66f913355a Docker builds (#231)
ci/woodpecker/push/woodpecker Pipeline was successful Details
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: #231
2022-10-16 19:25:54 +00:00