-
Notifications
You must be signed in to change notification settings - Fork 3.7k
fix(ci): Provide correct build info for release builds #15939
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
Conversation
Then building a binary or image release for an upcoming version from a release branch, we provide it as IMAGE_TAG as --build-arg. However, this argument was ignored in the Dockerfile and not further passed down to the `make ...` command inside the Docker build phase. Signed-off-by: Christian Haudum <christian.haudum@gmail.com>
11285a9
to
103b5c3
Compare
Hello @paul1r!
Please, if the current pull request addresses a bug fix, label it with the |
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-15939-to-release-3.3.x origin/release-3.3.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 625bdabce91f1043065b582052b2c3558c9af0e6 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-15939-to-release-3.3.x
# Create the PR body template
PR_BODY=$(gh pr view 15939 --json body --template 'Backport 625bdabce91f1043065b582052b2c3558c9af0e6 from #15939{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'fix(ci): Provide correct build info for release builds (backport release-3.3.x)' --body-file - --label 'size/S' --label 'backport' --label 'type/ci' --base release-3.3.x --milestone release-3.3.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-15939-to-release-3.3.x
# Create a pull request where the `base` branch is `release-3.3.x` and the `compare`/`head` branch is `backport-15939-to-release-3.3.x`.
# Remove the local backport branch
git switch main
git branch -D backport-15939-to-release-3.3.x |
Then building a binary or image release for an upcoming version from a release branch, we provide the version using `--build-arg IMAGE_TAG=...` in the Docker build step of the CI workflow ([ref](https://github.com/grafana/loki/blob/3df08bd39f45bbf8314f31a59f35b955b9a31a5e/.github/workflows/minor-release-pr.yml#L456)). However, this argument was ignored in the Dockerfile and not further passed down to the `make ...` command inside build phase of the Dockerfile. Signed-off-by: Christian Haudum <christian.haudum@gmail.com> (cherry picked from commit 625bdab)
Then building a binary or image release for an upcoming version from a release branch, we provide the version using `--build-arg IMAGE_TAG=...` in the Docker build step of the CI workflow ([ref](https://github.com/grafana/loki/blob/3df08bd39f45bbf8314f31a59f35b955b9a31a5e/.github/workflows/minor-release-pr.yml#L456)). However, this argument was ignored in the Dockerfile and not further passed down to the `make ...` command inside build phase of the Dockerfile. Signed-off-by: Christian Haudum <christian.haudum@gmail.com> (cherry picked from commit 625bdab)
Then building a binary or image release for an upcoming version from a release branch, we provide the version using `--build-arg IMAGE_TAG=...` in the Docker build step of the CI workflow ([ref](https://github.com/grafana/loki/blob/3df08bd39f45bbf8314f31a59f35b955b9a31a5e/.github/workflows/minor-release-pr.yml#L456)). However, this argument was ignored in the Dockerfile and not further passed down to the `make ...` command inside build phase of the Dockerfile. Signed-off-by: Christian Haudum <christian.haudum@gmail.com> # Conflicts: # clients/cmd/promtail/Dockerfile
What this PR does / why we need it:
Then building a binary or image release for an upcoming version from a release branch, we provide the version using
--build-arg IMAGE_TAG=...
in the Docker build step of the CI workflow (ref).However, this argument was ignored in the Dockerfile and not further passed down to the
make ...
command inside build phase of the Dockerfile.Special notes for your reviewer:
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