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

App-With-On-Behalf-Of: Set extended_jwt conf in docker-compose #214

Merged
merged 2 commits into from
Oct 25, 2023

Conversation

gamab
Copy link
Contributor

@gamab gamab commented Oct 25, 2023

The extended_jwt config options are not overridable with env variables.

There were multiple ways of tackling this:

  • changing Grafana to enable env overrides
  • mounting a custom.ini file and using it instead of /etc/grafana/grafana.ini
  • appending the extended_jwt config to the /etc/grafana/grafana.ini

I chose the last option so that it works with grafana:main already but also because we won't need to update the custom.ini file with grafana version increases.

On second thought, since we have to wait for 10.3.0 anyway, using env overrides is cleaner ( grafana/grafana#77132 )

@gamab gamab self-assigned this Oct 25, 2023
@gamab gamab requested a review from andresmgot October 25, 2023 10:22
Comment on lines 18 to 20
COPY extended_jwt.ini /tmp/extended_jwt.ini
RUN cat /tmp/extended_jwt.ini >> /etc/grafana/grafana.ini
Copy link
Contributor

Choose a reason for hiding this comment

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

I guess you could also copy the file as custom.ini? In any case both works so it's fine

@gamab gamab changed the title App-With-On-Behalf-Of: Inject extended_jwt conf in grafana ini file App-With-On-Behalf-Of: Set extended_jwt conf Oct 25, 2023
@gamab gamab changed the title App-With-On-Behalf-Of: Set extended_jwt conf App-With-On-Behalf-Of: Set extended_jwt conf in docker-compose Oct 25, 2023
@gamab gamab requested a review from andresmgot October 25, 2023 12:52
Copy link
Contributor

@andresmgot andresmgot left a comment

Choose a reason for hiding this comment

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

👍

@gamab gamab merged commit b78757a into main Oct 25, 2023
22 checks passed
@gamab gamab deleted the gamab/injectini branch October 25, 2023 13:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Development

Successfully merging this pull request may close these issues.

2 participants