Build: Unify custom dockerfiles, fix missing semicolon #59615
Merged
Conversation
This file contains 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
DanCech
changed the title
DanCech
added
no-backport
chri2547
reviewed
Nov 30, 2022
chri2547
reviewed
Nov 30, 2022
chri2547
reviewed
Nov 30, 2022
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
DanCech
added
type/bug
backport v9.3.x
and removed
no-backport
dsotirakis
approved these changes
Dec 1, 2022
|
@DanCech if I run this with I should expect this to build the docker image and skip all of the yarn install/yarn build/go gen/go build stuff and just use the assets from the tar file I provide, right? that doesn't seem to be happening 🤔 |
|
@kminehart this is in packaging/docker/custom/ which doesn't use GRAFANA_TGZ, it builds on top of an official image. To use the standard Dockerfile to build from TGZ you have to use buildkit and set JS_SRC and GO_SRC build args like the build scripts do |
|
doh. for some reason I thought we also were able to get rid of the ones in |
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-59615-to-v9.3.x origin/v9.3.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x c4bb9d637ea2a4cd16d90b64cf6cea88539edd6b
# Push it to GitHub
git push --set-upstream origin backport-59615-to-v9.3.x
git switch main
# Remove the local backport branch
git branch -D backport-59615-to-v9.3.xThen, create a pull request where the |
grafanabot
added
the
backport-failed
DanCech
added a commit
that referenced
this pull request
Dec 1, 2022
* unify custom dockerfiles, fix missing semicolon * tweak verbiage Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com> * update example description Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com> (cherry picked from commit c4bb9d6)
kwapik
pushed a commit
to fluxninja/grafana
that referenced
this pull request
Jan 3, 2023
* unify custom dockerfiles, fix missing semicolon * tweak verbiage Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com> * update example description Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
DanCech
added a commit
that referenced
this pull request
Jan 30, 2023
* unify custom dockerfiles, fix missing semicolon * tweak verbiage Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com> * update example description Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com> (cherry picked from commit c4bb9d6)
zerok
added a commit
that referenced
this pull request
Mar 31, 2023
zerok
added a commit
that referenced
this pull request
Apr 3, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
While fixing the typo @grongor pointed out in #58101 I realized that we don't really need 2 custom dockerfiles either, this PR unifies them into a single file that can be used to build alpine or ubuntu-based custom images.