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

✨ Use build args for the version string #778

Merged
merged 4 commits into from
Jan 28, 2025
Merged

Conversation

dymurray
Copy link
Contributor

No description provided.

Signed-off-by: Dylan Murray <dymurray@redhat.com>
Signed-off-by: Dylan Murray <dymurray@redhat.com>
@dymurray dymurray added the cherry-pick/release-0.6 This PR should be cherry-picked to release-0.6 branch label Jan 28, 2025
Dockerfile Outdated
@@ -15,13 +15,15 @@ FROM quay.io/konveyor/static-report as report

FROM registry.access.redhat.com/ubi9/ubi-minimal
ARG SEED_ROOT
ARG HUB_VERSION=latest
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@fbladilo this is where we can just template CI_VERSION

Copy link
Contributor

@jortel jortel Jan 28, 2025

Choose a reason for hiding this comment

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

Just a nit, but it is the file is building the hub image so the HUB_ seems redundant.

Copy link
Contributor

@jortel jortel left a comment

Choose a reason for hiding this comment

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

LGTM

Dockerfile Outdated
COPY --from=builder /opt/app-root/src/auth/roles.yaml /tmp/roles.yaml
COPY --from=builder /opt/app-root/src/auth/users.yaml /tmp/users.yaml
COPY --from=builder ${SEED_ROOT}/resources/ /tmp/seed
COPY --from=report /usr/local/static-report /tmp/analysis/report

RUN echo "${HUB_VERSION}" >> /etc/hub-build

Choose a reason for hiding this comment

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

Is this append (>>) desired instead of the overwrite (>) that was previously used to generate this file? Is there any concern where appending could introduce a problem that wouldn't be observed by overwriting?

Choose a reason for hiding this comment

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

It seems safe given it should be a new file creation regardless, but wanted to toss it out there... 😉

Copy link
Contributor

Choose a reason for hiding this comment

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

Agreed > would be more correct.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fair point; considering the base is always reset I don't think this would be an issue but no reason to append!

Copy link

@rayfordj rayfordj left a 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: Dylan Murray <dymurray@redhat.com>
Signed-off-by: Dylan Murray <dymurray@redhat.com>
@fbladilo
Copy link
Contributor

LGTM

@dymurray dymurray merged commit 0986cad into konveyor:main Jan 28, 2025
13 checks passed
github-actions bot pushed a commit that referenced this pull request Jan 28, 2025
Signed-off-by: Dylan Murray <dymurray@redhat.com>
Signed-off-by: Cherry Picker <noreply@github.com>
dymurray added a commit that referenced this pull request Feb 5, 2025
Signed-off-by: Dylan Murray <dymurray@redhat.com>
Signed-off-by: Cherry Picker <noreply@github.com>

Signed-off-by: Dylan Murray <dymurray@redhat.com>
Signed-off-by: Cherry Picker <noreply@github.com>
Co-authored-by: Dylan Murray <dymurray@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick/release-0.6 This PR should be cherry-picked to release-0.6 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants