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

Docker: Support pre-installed plugins from other sources in custom Dockerfiles #31234

Merged
merged 5 commits into from
Mar 11, 2021

Conversation

sgnsys3
Copy link
Contributor

@sgnsys3 sgnsys3 commented Feb 16, 2021

What this PR does / why we need it:

Refer to this document: https://grafana.com/docs/grafana/latest/installation/docker/#build-and-run-a-docker-image-with-pre-installed-plugins

Installing plugins from URL is not supported when building Docker image with pre-installed plugins.

Which issue(s) this PR fixes:
Add install plugins from URL script when building Docker image with pre-installed plugins.

Fixes: #31302

@CLAassistant
Copy link

CLAassistant commented Feb 16, 2021

CLA assistant check
All committers have signed the CLA.

@aknuds1 aknuds1 requested a review from xlson February 17, 2021 07:11
@aknuds1 aknuds1 added pr/external This PR is from external contributor type/build-packaging type/chore labels Feb 17, 2021
Copy link
Contributor

@aknuds1 aknuds1 left a comment

Choose a reason for hiding this comment

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

AFAICT, the technical changes make sense, but I'd have to hear with others to figure out if we want this. I think also documentation would have to be updated to reflect this support?

@marefr
Copy link
Contributor

marefr commented Feb 17, 2021

@sgnsys3 could you please open a feature request describing the use case more detailed and why you cannot customize this in your custom built image and why it should be included in our custom image. Then reference the created issue in the PR description. Thanks

@aknuds1 aknuds1 added the pr/needs-discussion This PR needs a bigger discussion label Feb 17, 2021
@sgnsys3
Copy link
Contributor Author

sgnsys3 commented Feb 18, 2021

@marefr I have created and reference issue in this PR. This is correct?

Copy link
Contributor

@marefr marefr left a comment

Choose a reason for hiding this comment

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

Based on discussion in the issue this looks good. But the ubuntu.Dockerfile needs update as well.

@marefr marefr removed the pr/needs-discussion This PR needs a bigger discussion label Mar 8, 2021
@sgnsys3
Copy link
Contributor Author

sgnsys3 commented Mar 9, 2021

@marefr I updated ubuntu.Dockerfile.

Copy link
Contributor

@marefr marefr left a comment

Choose a reason for hiding this comment

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

LGTM

@marefr marefr changed the title Docker: update custom image Dockerfile for install plugin from URL Docker: Update custom image Dockerfile for install plugin from URL Mar 9, 2021
Copy link
Contributor

@marefr marefr left a comment

Choose a reason for hiding this comment

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

Was a bit fast there.

  • Please merge with master to resolve CI build problems.
  • Please update this section in the documentation to denote installing plugins from other sources is supported. For reference, here's the markdown file that needs update.

@sgnsys3 sgnsys3 requested a review from a team as a code owner March 10, 2021 09:17
@sgnsys3 sgnsys3 requested review from oddlittlebird, achatterjee-grafana and osg-grafana and removed request for a team March 10, 2021 09:17
Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
Copy link
Contributor

@marefr marefr left a comment

Choose a reason for hiding this comment

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

LGTM

@marefr marefr merged commit 05d6d32 into grafana:master Mar 11, 2021
@marefr
Copy link
Contributor

marefr commented Mar 11, 2021

Thank you for contributing to Grafana!

@marefr marefr changed the title Docker: Update custom image Dockerfile for install plugin from URL Docker: Support pre-installed plugins from other sources in custom Dockerfiles Mar 11, 2021
@marefr marefr modified the milestones: 7.5.x, 7.5.0-stable Mar 11, 2021
@marefr
Copy link
Contributor

marefr commented Mar 11, 2021

Shouldn't need backport since documentation refers to this repository for building custom Docker image and the master branch is the default.

ryantxu pushed a commit to dejapong/grafana that referenced this pull request Mar 30, 2021
…ockerfiles (grafana#31234)

Update custom Dockerfiles to support pre-installing plugins from other sources.

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Feature Request: Install plugins from other sources on custom Dockerfile.
6 participants