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

chore: introduce .env.override for docker-compose #1584

Merged
merged 4 commits into from
Jun 3, 2024

Conversation

rogercoll
Copy link
Contributor

@rogercoll rogercoll commented May 27, 2024

Changes

This PR adds the .env.override file that will be used together with the .env file to populate environment variables used with docker compose. The purpose of this file is to ease the maintenance of forked repositories by allowing them to override environment variables and avoiding merge conflicts.

Related issue: #1405

For example, we could simply duplicate the collector env var into our .env.override to use our distribution:

COLLECTOR_CONTRIB_IMAGE=elastic/elastic-agent:8.13.4

Merge Requirements

For new features contributions please make sure you have completed the following
essential items:

* [ ] CHANGELOG.md updated to document new feature additions
* [ ] Appropriate documentation updates in the docs
* [ ] Appropriate Helm chart updates in the helm-charts

Maintainers will not merge until the above have been completed. If you're unsure
which docs need to be changed ping the
@open-telemetry/demo-approvers.

@rogercoll rogercoll requested a review from a team May 27, 2024 09:35
@rogercoll
Copy link
Contributor Author

@open-telemetry/demo-approvers any feedback on this PR?

@austinlparker austinlparker merged commit b2f6fbf into open-telemetry:main Jun 3, 2024
28 checks passed
@rogercoll rogercoll deleted the add_override_env_file branch June 3, 2024 19:48
AlexPSplunk pushed a commit to splunk/edu-opentelemetry-demo that referenced this pull request Jul 10, 2024
* chore: introduce .env.override for docker-compose

* parametrize docker compose cmd and env files

---------

Co-authored-by: Austin Parker <austin@ap2.io>
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