Skip to content

NO-JIRA: copy oc binary from cli-artifacts #419

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

Closed
jeffdyoung wants to merge 1 commit into from
Closed

NO-JIRA: copy oc binary from cli-artifacts #419

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 1 deletion Dockerfile.rhel7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ FROM registry.ci.openshift.org/ocp/4.16:cli-artifacts as cli-artifacts

FROM registry.ci.openshift.org/ocp/4.16:cli
COPY --from=builder /go/src/github.com/openshift/must-gather/collection-scripts/* /usr/bin/
COPY --from=cli-artifacts /usr/share/openshift/linux_amd64/oc.rhel8 /usr/bin/oc
COPY --from=cli-artifacts /usr/bin/oc /usr/bin/oc

@jeffdyoung jeffdyoung May 2, 2024

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

@sferich888 we don't have to copy a specific oc arch here. The cli-artifacts container has the rhel8 variant of oc in /usr/bin/oc. Since the build system builds on native HW, we will always get the right binary arch.

https://github.com/openshift/oc/blob/master/images/cli-artifacts/Dockerfile.rhel#L15-L21

@ardaguclu ardaguclu May 2, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

We are trying to change the default oc's base image to RHEL9 and default oc in cli-artifacts will also not work on must-gather.
/hold

@ardaguclu ardaguclu May 2, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Proposed this #420 instead


RUN yum install --setopt=tsflags=nodocs -y jq && yum clean all && rm -rf /var/cache/yum/*