Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docker compose upgrade #248

Merged
merged 6 commits into from
Jan 3, 2024
Merged

Docker compose upgrade #248

merged 6 commits into from
Jan 3, 2024

Conversation

oscgonfer
Copy link
Contributor

This branch is to add changes on the docker-compose example file, in particular to make use of resource limitations and better restart policies of services.

Bear in mind that there is no more version at the beginning of the file, or there shouldn't be.

#235

@oscgonfer oscgonfer closed this Oct 20, 2023
@oscgonfer oscgonfer reopened this Oct 20, 2023
@oscgonfer oscgonfer force-pushed the chore/docker-compose-upgrade branch from 578f4b6 to 7c791b8 Compare October 20, 2023 16:33
@oscgonfer oscgonfer changed the title Chore/docker compose upgrade Docker compose upgrade Oct 20, 2023
@timcowlishaw
Copy link
Contributor

We should also look into a better way of handling host-specific docker-compose config - one option would be to have a checked-in docker-compose.example.yml and ignore docker-compose.yml itself (then update the github actions and readme to make it clear this needs to be copied), or maybe there's something in https://docs.docker.com/compose/multiple-compose-files/ we could use to copy out host-specific stuff into includes?

Copy link
Contributor

@timcowlishaw timcowlishaw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey Oscar! This is looking good to me - I've fixed a small syntax error in the new compose file, and also:

  1. renamed to compose.yml, the new default
  2. added a compose.override.local.yml for local development
  3. expanded the local dev section in the readme to make it clear what this is for
  4. consistently renamed docker-compose to docker compose everywhere to reflect the new recommended systax

@timcowlishaw
Copy link
Contributor

Oh, i've also just split out the compose.yml file into an include for each service, which should make things more manageable!

@timcowlishaw timcowlishaw force-pushed the chore/docker-compose-upgrade branch from c4881d9 to 6f461ca Compare November 25, 2023 06:01
@oscgonfer
Copy link
Contributor Author

oscgonfer commented Nov 30, 2023

Hi @timcowlishaw
Very nice and neat upgrade. Thanks.

Some improvements I would suggest for documentation:

  • Now we rely on docker compose > 2.20. I would suggest having a documented way to make sure people can easily see what version is needed.
  • The README.md, although updated, is confusing in general (it was before already). If possible, I would ask to various sections with step by step processes for:
    • First time deployment
    • Normal operations (update, restart, etc.)
    • Test
    • Bring services down
    • Recommended setup (machine requirements -- RAM: 8GiB if using cassandra and mqtt on the same machine (TBC)) and our production setup (I can take care of that one)

@timcowlishaw timcowlishaw force-pushed the chore/docker-compose-upgrade branch 2 times, most recently from 196ba48 to 283d138 Compare December 1, 2023 08:51
@timcowlishaw timcowlishaw force-pushed the chore/docker-compose-upgrade branch from 283d138 to 8b8189a Compare December 13, 2023 09:22
@timcowlishaw timcowlishaw force-pushed the chore/docker-compose-upgrade branch from 8b8189a to 467c8b3 Compare December 20, 2023 19:39
@timcowlishaw timcowlishaw force-pushed the chore/docker-compose-upgrade branch from 467c8b3 to a178a06 Compare December 21, 2023 11:59
@oscgonfer
Copy link
Contributor Author

oscgonfer commented Jan 3, 2024

@timcowlishaw Is it OK for me to merge?
Maybe we can solve #248 (comment) documentation briefl while is fresh before merging or would you rather do it on a separate issue?

@timcowlishaw
Copy link
Contributor

Hey @oscgonfer ! Aha sure thing, that sounds sensible - i can get to the documentation part later this week!

@oscgonfer oscgonfer merged commit c817499 into master Jan 3, 2024
2 checks passed
@timcowlishaw timcowlishaw deleted the chore/docker-compose-upgrade branch July 4, 2024 08:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants