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

Makefile does not always use DOCKER_COMPOSE_ENV var #1759

Merged
merged 2 commits into from
Oct 31, 2024

Conversation

dadoonet
Copy link
Contributor

@dadoonet dadoonet commented Oct 30, 2024

Changes

Let say that you add a /src/adservice/Dockerfile.elastic to the project to build a specific version of the image. So you add the following line to the .env.override file:

AD_SERVICE_DOCKERFILE=./src/adservice/Dockerfile.elastic

If you run:

make redeploy

The /src/adservice/Dockerfile.elastic should be used instead of the default one.

This commit adds DOCKER_COMPOSE_ENV variable anywhere it's needed.

Closes #1758.

Let say that you add a `/src/adservice/Dockerfile.elastic` to the project to build a specific version of the image.
So you add the following line to the `.env.override` file:

```env
AD_SERVICE_DOCKERFILE=./src/adservice/Dockerfile.elastic
```

If you run:

```sh
make redeploy
```

The `/src/adservice/Dockerfile.elastic` should be used instead the default one.

This commit adds `DOCKER_COMPOSE_ENV` variable anywhere it's needed.

Closes open-telemetry#1758.
@dadoonet dadoonet requested a review from a team as a code owner October 30, 2024 14:27
Copy link

linux-foundation-easycla bot commented Oct 30, 2024

CLA Signed

The committers listed above are authorized under a signed CLA.

Copy link
Contributor

@rogercoll rogercoll left a comment

Choose a reason for hiding this comment

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

Looks great! Thanks for fixing this

@dadoonet
Copy link
Contributor Author

There's still an error with markdownlinkcheck but I did not change anything ;)

@trentm
Copy link

trentm commented Oct 30, 2024

There's still an error with markdownlinkcheck but I did not change anything ;)

I think that was a fluke error: the link checker got a 502 for a particular GitHub repo URL during that check. Perhaps @rogercoll could re-run the test (I don't have access to re-run the workflow).

@rogercoll
Copy link
Contributor

There's still an error with markdownlinkcheck but I did not change anything ;)

I think that was a fluke error: the link checker got a 502 for a particular GitHub repo URL during that check. Perhaps @rogercoll could re-run the test (I don't have access to re-run the workflow).

Correct, rerunning it fixed the issue.

@julianocosta89 julianocosta89 merged commit 2d4661e into open-telemetry:main Oct 31, 2024
29 checks passed
@dadoonet dadoonet deleted the 1758-Makefile-env branch October 31, 2024 09:41
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.

Makefile does not always use DOCKER_COMPOSE_ENV var
4 participants