Skip to content
This repository has been archived by the owner on Aug 4, 2023. It is now read-only.

Move dev-specific services into compose overrides file #217

Merged
merged 1 commit into from
Oct 5, 2021

Conversation

AetherUnbound
Copy link
Contributor

@AetherUnbound AetherUnbound commented Oct 4, 2021

Fixes

Fixes #212 by @AetherUnbound

Description

This PR moves the s3 and postgres services which are only used in development into the docker-compose.overrides.yml. Thanks to #153, running commands with the override file during the dev process is relatively easy. We cannot remove services with an override file (only add or override). Production only needs one service and local development needs three, our new default is that the bare docker-compose.yml file is used for production, and the override file is used for local development.

I've also updated the tests action use the appropriate docker-compose command for launching the test. This will be replaced with just in #216.

Testing Instructions

Checklist

  • My pull request has a descriptive title (not a vague title like Update index.md).
  • My pull request targets the default branch of the repository (main) or a parent feature branch.
  • My commit messages follow best practices.
  • My code follows the established code style of the repository.
  • I added or updated tests for the changes I made (if applicable).
  • I added or updated documentation (if applicable).
  • I tried running the project locally and verified that there are no visible errors.

Developer Certificate of Origin

Developer Certificate of Origin
Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.


Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.

@AetherUnbound AetherUnbound added ✨ goal: improvement Improvement to an existing user-facing feature 🤖 aspect: dx Concerns developers' experience with the codebase labels Oct 4, 2021
@AetherUnbound AetherUnbound requested review from obulat, sarayourfriend and a team October 4, 2021 23:38
@AetherUnbound AetherUnbound force-pushed the improvement/development-docker-compose#212 branch from 1ef64cc to 927abaa Compare October 4, 2021 23:40
Copy link
Member

@zackkrida zackkrida left a comment

Choose a reason for hiding this comment

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

Great!

@AetherUnbound
Copy link
Contributor Author

Ah yikes, I messed that merge up 🤦‍♀️

@AetherUnbound AetherUnbound force-pushed the improvement/development-docker-compose#212 branch from 0be7797 to 927abaa Compare October 5, 2021 15:26
@AetherUnbound
Copy link
Contributor Author

Reverting the merge from #218, I'll cherry pick that onto main once this one gets approved!

Copy link
Contributor

@sarayourfriend sarayourfriend left a comment

Choose a reason for hiding this comment

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

Nice! LGTM!

@AetherUnbound AetherUnbound merged commit edd0ab9 into main Oct 5, 2021
@AetherUnbound AetherUnbound deleted the improvement/development-docker-compose#212 branch October 5, 2021 18:15
@AetherUnbound
Copy link
Contributor Author

Whew, #218 has been cherry-picked successfully. Crisis averted!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
🤖 aspect: dx Concerns developers' experience with the codebase ✨ goal: improvement Improvement to an existing user-facing feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Move development services into compose override file
3 participants