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: update docker root group docs and docker image #29222

Merged
merged 7 commits into from
Nov 23, 2020

Conversation

xlson
Copy link
Contributor

@xlson xlson commented Nov 19, 2020

What this PR does / why we need it:

Updates the docs and root docker image to stay consistent with the change made in 7.3 to support OpenShift. I should have done this when making the change but forgot at the time.

Which issue(s) this PR fixes:

Related to #27813 and #28614

Special notes for your reviewer:

@xlson xlson added the type/docs Flags the technical writing team for documentation support; auto adds to org-wide docs project label Nov 19, 2020
@xlson xlson requested a review from a team as a code owner November 19, 2020 10:07
@xlson xlson requested review from oddlittlebird, achatterjee-grafana, osg-grafana and aknuds1 and removed request for a team November 19, 2020 10:07
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.

LGTM, but see suggestions.

docs/sources/installation/docker.md Outdated Show resolved Hide resolved
docs/sources/installation/upgrading.md Outdated Show resolved Hide resolved
@aknuds1 aknuds1 added this to the 7.4.0 milestone Nov 19, 2020
xlson and others added 2 commits November 20, 2020 11:04
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Copy link
Contributor

@achatterjee-grafana achatterjee-grafana left a comment

Choose a reason for hiding this comment

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

Added a few copy-edit suggestions.

CHANGELOG.md Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
xlson and others added 2 commits November 23, 2020 10:52
Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
@osg-grafana
Copy link
Contributor

root group --> 'root' group
grafana group --> 'grafana' group

Edit: Thanks for catching my typos and going ahead with the intended meaning. :)

@xlson xlson merged commit b44a41a into grafana:master Nov 23, 2020
@xlson xlson deleted the fix-docker-root-group-docs branch November 23, 2020 11:30
xlson added a commit to AgnesToulet/grafana that referenced this pull request Nov 24, 2020
* master: (71 commits)
  Security: Fixes minor security issue with alert notification webhooks that allowed GET & DELETE requests grafana#29330
  Chore: Bump storybook to v6 (grafana#28926)
  ReleaseNotes: Updates release notes link in package.json (master) (grafana#29329)
  Docs: Accurately reflecting available variables (grafana#29302)
  Heatmap: Fixes issue introduced by new eventbus (grafana#29322)
  Dashboard Schemas (grafana#28793)
  devenv: Add docker load test which authenticates with API key (grafana#28905)
  Login: Fixes redirect url encoding issues of # %23 being unencoded after login (grafana#29299)
  InfluxDB: update flux library and support boolean label values (grafana#29310)
  Explore/Logs: Update Parsed fields to Detected fields (grafana#28881)
  GraphNG: Init refactorings and fixes (grafana#29275)
  fixing a broken relref link (grafana#29312)
  Drone: Upgrade build pipeline tool (grafana#29308)
  decreasing frontend docs threshold. (grafana#29304)
  Docker: update docker root group docs and docker image (grafana#29222)
  WebhookNotifier: Convert tests away from goconvey (grafana#29291)
  Annotations: fixing so when changing annotations query links submenu will be updated. (grafana#28990)
  [graph-ng] add temporal DataFrame alignment/outerJoin & move null-asZero pass inside (grafana#29250)
  Dashboard: Fixes kiosk state after being redirected to login page and back (grafana#29273)
  make it possible to hide change password link in profile menu (grafana#29246)
  ...
@mjseaman mjseaman added this to the 7.4.0 milestone Jan 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type/docs Flags the technical writing team for documentation support; auto adds to org-wide docs project
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants