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

fix(ci): Provide correct build info for release builds (#15939) #16214

Merged
merged 3 commits into from
Feb 12, 2025

Conversation

salvacorts
Copy link
Contributor

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.

Signed-off-by: Christian Haudum [email protected]
(cherry picked from commit 625bdab)

What this PR does / why we need it:

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • Title matches the required conventional commits format, see here
    • Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR

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 <[email protected]>
(cherry picked from commit 625bdab)
In order to access the variable ${IMAGE_TAG} that is provided as `--build-arg IMAGE_TAG=x.x.x` in the `docker build` command, the `ARG` definition in the Dockerfile needs to be inside the build step block, otherwise it is empty.

Signed-off-by: Christian Haudum <[email protected]>
(cherry picked from commit ed061b3)
@salvacorts salvacorts marked this pull request as ready for review February 12, 2025 12:02
@salvacorts salvacorts requested a review from a team as a code owner February 12, 2025 12:02
Copy link
Contributor

@ashwanthgoli ashwanthgoli left a comment

Choose a reason for hiding this comment

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

lgtm

@ashwanthgoli ashwanthgoli enabled auto-merge (squash) February 12, 2025 12:06
@ashwanthgoli ashwanthgoli merged commit e5f80d3 into release-3.3.x Feb 12, 2025
59 checks passed
@ashwanthgoli ashwanthgoli deleted the salvacorts/backport-3.3.3x branch February 12, 2025 12:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants