Add docker override file to docs and gitignore #621

Merged

floatingghost merged 1 commits from norm/akkoma:docker-compose-override into develop

2024-04-12 18:50:25 +00:00

norm commented

2023-08-07 17:13:49 +00:00

Contributor

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.

Supersedes #617

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. Supersedes https://akkoma.dev/AkkomaGang/akkoma/pulls/617

norm added 1 commit 2023-08-07 17:13:50 +00:00

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

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.

norm referenced this pull request

2023-08-07 17:14:02 +00:00

Add docker-compose.yml to gitignore #617