This repository was archived by the owner on Sep 30, 2024. It is now read-only.
dev: fix Grafana startup on Linux#11533
Merged
Merged
Conversation
The changes in #11483 made it difficult to start Grafana within a Linux development environment, and #11486 obscured the error in the goreman output. This restores the previous behaviour around the UID the container will run as, and ensures that logs will be dumped if the container exits unexpectedly.
LawnGnome
commented
Jun 16, 2020
Member
|
Thanks for sending this! |
Codecov Report
@@ Coverage Diff @@
## master #11533 +/- ##
==========================================
- Coverage 47.46% 47.45% -0.01%
==========================================
Files 1401 1401
Lines 79460 79460
Branches 6728 6816 +88
==========================================
- Hits 37712 37710 -2
- Misses 38172 38173 +1
- Partials 3576 3577 +1
|
emidoots
approved these changes
Jun 16, 2020
emidoots
left a comment
Member
There was a problem hiding this comment.
LGTM; should we do the same thing in dev/prometheus.sh too?
bobheadxi
approved these changes
Jun 16, 2020
Comment on lines
+25
to
+30
| # Docker users on Linux will generally be using direct user mapping, which | ||
| # means that they'll want the data in the volume mount to be owned by the | ||
| # same user as is running this script. Fortunately, the Grafana container | ||
| # doesn't really care what user it runs as, so long as it can write to | ||
| # /var/lib/grafana. | ||
| DOCKER_USER="--user=$UID" |
Contributor
Author
I'm happy to leave that to you if you have the time, since everything I know about Prometheus is that it was a movie, but if you want me to do that, let me know. |
3 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The changes in #11483 made it difficult to start Grafana within a Linux development environment, and #11486 obscured the error in the goreman output. This restores the previous behaviour around the UID the container will run as, and ensures that logs will be dumped if the container exits unexpectedly.