Build: Unified dockerfile for all builds #59173
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
force-pushed
the
streamline-docker
branch
from
354499c
to
aa5de3c
Compare
DanCech
force-pushed
the
single-dockerfile
branch
from
3f49924
to
85e47fe
Compare
DanCech
force-pushed
the
single-dockerfile
branch
from
a6f77a0
to
2cf1f7d
Compare
kminehart
approved these changes
Nov 28, 2022
DanCech
changed the title
DanCech
force-pushed
the
single-dockerfile
branch
from
2cf1f7d
to
97beff3
Compare
DanCech
added
type/bug
backport v9.3.x
and removed
no-backport
|
Needs #58101 backported first |
|
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-59173-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 7436872dab759657a4377c964383ea6ae7ca408d
# Push it to GitHub
git push --set-upstream origin backport-59173-to-v9.3.x
git switch main
# Remove the local backport branch
git branch -D backport-59173-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
* unified dockerfile for all builds * update builder * include docker commands and output in logs * quiet docker build * quiet gsutil (cherry picked from commit 7436872)
kwapik
pushed a commit
to fluxninja/grafana
that referenced
this pull request
Jan 3, 2023
* unified dockerfile for all builds * update builder * include docker commands and output in logs * quiet docker build * quiet gsutil
DanCech
added a commit
that referenced
this pull request
Jan 30, 2023
* unified dockerfile for all builds * update builder * include docker commands and output in logs * quiet docker build * quiet gsutil (cherry picked from commit 7436872)
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.
This PR leverages docker buildkit to use a single dockerfile for all our docker images
It works by using build args to configure the dependency between the stages, so that when we're building from a tarball we use the tgz-builder while otherwise we use the js-builder and go-builder stages. This requires buildkit as without it all the stages will be built regardless of whether they are needed in the final stage.