-
Notifications
You must be signed in to change notification settings - Fork 3.5k
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
fix(build): Use Debian Bullseye base image for build image #14368
Conversation
Hello @chaudum!
Please, if the current pull request addresses a bug fix, label it with the |
Hello @chaudum!
Please, if the current pull request addresses a bug fix, label it with the |
This change is necessary to allow the binaries built using the Loki build image to run on operating systems with older libc version. Signed-off-by: Christian Haudum <[email protected]>
Signed-off-by: Christian Haudum <[email protected]>
3d71202
to
1ccbe50
Compare
This PR must be merged before a backport PR will be created. |
Signed-off-by: Christian Haudum <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
Signed-off-by: Christian Haudum <[email protected]>
Signed-off-by: Christian Haudum <[email protected]>
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-14368-to-release-3.1.x origin/release-3.1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 3beb8ff9cfe7f765b5d5db87892981a223d72f50 When the conflicts are resolved, stage and commit the changes:
If you have the GitHub CLI installed: # Push the branch to GitHub:
git push --set-upstream origin backport-14368-to-release-3.1.x
# Create the PR body template
PR_BODY=$(gh pr view 14368 --json body --template 'Backport 3beb8ff9cfe7f765b5d5db87892981a223d72f50 from #14368{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'fix(build): Use Debian Bullseye base image for build image (backport release-3.1.x)' --body-file - --label 'size/M' --label 'type/build' --label 'type/docs' --label 'type/bug' --label 'backport' --base release-3.1.x --milestone release-3.1.x --web Or, if you don't have the GitHub CLI installed (we recommend you install it!): # Push the branch to GitHub:
git push --set-upstream origin backport-14368-to-release-3.1.x
# Create a pull request where the `base` branch is `release-3.1.x` and the `compare`/`head` branch is `backport-14368-to-release-3.1.x`.
# Remove the local backport branch
git switch main
git branch -D backport-14368-to-release-3.1.x |
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-14368-to-release-3.2.x origin/release-3.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 3beb8ff9cfe7f765b5d5db87892981a223d72f50 When the conflicts are resolved, stage and commit the changes:
If you have the GitHub CLI installed: # Push the branch to GitHub:
git push --set-upstream origin backport-14368-to-release-3.2.x
# Create the PR body template
PR_BODY=$(gh pr view 14368 --json body --template 'Backport 3beb8ff9cfe7f765b5d5db87892981a223d72f50 from #14368{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'fix(build): Use Debian Bullseye base image for build image (backport release-3.2.x)' --body-file - --label 'size/M' --label 'type/build' --label 'type/docs' --label 'type/bug' --label 'backport' --base release-3.2.x --milestone release-3.2.x --web Or, if you don't have the GitHub CLI installed (we recommend you install it!): # Push the branch to GitHub:
git push --set-upstream origin backport-14368-to-release-3.2.x
# Create a pull request where the `base` branch is `release-3.2.x` and the `compare`/`head` branch is `backport-14368-to-release-3.2.x`.
# Remove the local backport branch
git switch main
git branch -D backport-14368-to-release-3.2.x |
This change is necessary to allow the binaries built using the Loki build image to run on operating systems with older libc version. --- Backport of #14368 Signed-off-by: Christian Haudum <[email protected]>
This change is necessary to allow the binaries built using the Loki build image to run on operating systems with older libc version. --- Backport of #14368 Signed-off-by: Christian Haudum <[email protected]>
…in Promtail (#14387) Backport of #14368 to 3.1.x release branch Signed-off-by: Christian Haudum <[email protected]>
…in Promtail (#14386) Backport of #14368 to 3.2.x release branch Signed-off-by: Christian Haudum <[email protected]>
What this PR does / why we need it:
This change is necessary to allow the binaries built using the Loki build image to run on operating systems with older libc version.
E.g. Promtail is built with cgo (
CGO_ENABLED=1
), because thejournald
target support requires it.Which issue(s) this PR fixes:
Fixes #13393
Further discussion
The .deb and .rpm packages should define the libc version as dependency.
Checklist
CONTRIBUTING.md
guide (required)feat
PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.docs/sources/setup/upgrade/_index.md
deprecated-config.yaml
anddeleted-config.yaml
files respectively in thetools/deprecated-config-checker
directory. Example PR