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

Add plugin.json to the renderer Docker images #248

Merged
merged 1 commit into from
Jun 8, 2021

Conversation

mbentley
Copy link
Contributor

@mbentley mbentley commented Jun 8, 2021

Fixes #247

Signed-off-by: Matt Bentley mbentley@mbentley.net

Copy link
Contributor

@AgnesToulet AgnesToulet left a comment

Choose a reason for hiding this comment

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

Looks good! Thanks for the quick find and fix. Could you also add this line to debian.Dockerfile please?

Also, merging with master should fix the failing pipeline.

@mbentley
Copy link
Contributor Author

mbentley commented Jun 8, 2021

Ah sure, I didn't even look for the other Dockerfile. Will take care of that in a second.

*Edit: rebased for a single commit.

@AgnesToulet
Copy link
Contributor

Thanks a lot! Can you also merge with the latest CircleCI change on master? Else I won't be able to merge your PR as the pipeline is failing.

Signed-off-by: Matt Bentley <mbentley@mbentley.net>
@mbentley
Copy link
Contributor Author

mbentley commented Jun 8, 2021

Whoops - sorry read your comment too quickly! Updated from master.

@AgnesToulet AgnesToulet changed the title Add plugin.json to the renderer Docker image; fixes #247 Add plugin.json to the renderer Docker images Jun 8, 2021
@AgnesToulet AgnesToulet merged commit 44505eb into grafana:master Jun 8, 2021
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.

Docker packaging needs updated for #239
2 participants