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.

Sign up for GitHub

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

✨ Use build args for the version string #778

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4e3d9aa
:sparkles: Use build args for the version string
dymurray Jan 28, 2025
e9b4447
oops
dymurray Jan 28, 2025
accf15e
Overwrite don't append!
dymurray Jan 28, 2025
db9f521
change name of var
dymurray Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/march-image-build-push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ jobs:
image_name: "tackle2-hub"
containerfile: "./Dockerfile"
architectures: '[ "amd64", "arm64" ]'
extra-args: |
--build-arg
HUB_VERSION=${{ github.tag}}-${{ github.ref }}
secrets:
registry_username: ${{ secrets.QUAY_PUBLISH_ROBOT }}
registry_password: ${{ secrets.QUAY_PUBLISH_TOKEN }}
4 changes: 3 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 •
edited
Loading

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 --from=builder /opt/app-root/src/bin/hub /usr/local/bin/tackle-hub
COPY --from=builder /opt/app-root/src/bin/.build /etc/hub-build
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
Copy link

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?

Copy link

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!


RUN microdnf -y install \
sqlite \
&& microdnf -y clean all
Expand Down
1 change: 0 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ debug: generate fmt vet

docker: vet
go build $(BUILD)
git describe --always --match "v[0-9]*" --tags HEAD > bin/.build

# Run against the configured Kubernetes cluster in ~/.kube/config
run: fmt vet
Expand Down
Loading