[rhoai-2.25.10] RHAIENG-287: fix(Dockerfiles): wrap remaining RUN && chains in bash heredocs#2485
[rhoai-2.25.10] RHAIENG-287: fix(Dockerfiles): wrap remaining RUN && chains in bash heredocs#2485jiridanek wants to merge 1 commit into
Conversation
…eredocs Convert workbench Dockerfiles (excluding datascience and rstudio) to RUN /bin/bash <<'EOF' blocks so hadolint accepts source and multiline install steps stay readable. Co-authored-by: Cursor <cursoragent@cursor.com>
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
Warning Review limit reached
Next review available in: 33 minutes Enable usage-based reviews in Billing to review now. Otherwise, wait until the next included review is available. How can I continue?After more reviews become available, a review can be triggered using the To avoid repeated limits, reduce automatic review volume by pausing incremental auto-reviews earlier, using label-based review opt-in, excluding WIP or generated PR titles, or requesting reviews manually when the PR is ready. If your team needs uninterrupted high-volume reviews, an organization admin can enable usage-based reviews. How do review limits work?CodeRabbit enforces per-developer PR review limits for each organization. Most developers receive the normal plan review availability. For paid Pro and Pro+ PR reviews, CodeRabbit uses adaptive limits for sustained high-volume activity. When a developer's recent PR review activity reaches the 95th percentile or higher among CodeRabbit users, additional reviews become available more gradually as earlier reviews age out of the rolling window. Please refer docs for additional details. Review details⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: CHILL Plan: Enterprise Run ID: 📒 Files selected for processing (32)
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| tar -xzvf /tmp/openshift-client-linux.tar.gz oc && \ | ||
| rm -f /tmp/openshift-client-linux.tar.gz | ||
| RUN /bin/bash <<'EOF' | ||
| set -Eeuxo pipefail |
| tar -xzvf /tmp/openshift-client-linux.tar.gz oc && \ | ||
| rm -f /tmp/openshift-client-linux.tar.gz | ||
| RUN /bin/bash <<'EOF' | ||
| set -Eeuxo pipefail |
| RUN dnf install -y perl mesa-libGL skopeo && dnf clean all && rm -rf /var/cache/yum | ||
| RUN /bin/bash <<'EOF' | ||
| set -Eeuxo pipefail | ||
| dnf install -y perl mesa-libGL skopeo |
| RUN dnf install -y perl mesa-libGL skopeo && dnf clean all && rm -rf /var/cache/yum | ||
| RUN /bin/bash <<'EOF' | ||
| set -Eeuxo pipefail | ||
| dnf install -y perl mesa-libGL skopeo |
| curl -L https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/clients/ocp/stable/openshift-client-linux.tar.gz \ | ||
| -o /tmp/openshift-client-linux.tar.gz | ||
| tar -xzvf /tmp/openshift-client-linux.tar.gz oc | ||
| rm -f /tmp/openshift-client-linux.tar.gz |
| tar -xzvf /tmp/openshift-client-linux.tar.gz oc && \ | ||
| rm -f /tmp/openshift-client-linux.tar.gz | ||
| RUN /bin/bash <<'EOF' | ||
| set -Eeuxo pipefail |
| set -Eeuxo pipefail | ||
| dnf install -y perl mesa-libGL skopeo libxcrypt-compat | ||
| dnf clean all | ||
| rm -rf /var/cache/yum |
jiridanek
changed the title
jiridanek
changed the title
|
PR needs rebase. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
2 participants
Description
Follow-up to #2471. Converts remaining
RUN ... && ...chains in 32 workbench Dockerfiles toRUN /bin/bash <<'EOF'blocks withset -Eeuxo pipefail, matching the pattern already applied to datascience images.Scope:
jupyter/,runtimes/, andcodeserver/workbench images (cpu/cuda/rocm + konflux pairs). Excludesrstudio/(RHAIENG-2430) and datascience (done in #2471).Conventions:
sourcepreserved inside bash heredocs (not.) for gcc-toolset / profile.d scriptsEOFbefore the next Dockerfile instruction (hadolint)bash -cmount blocks expanded to multilineif/fiwhere applicable\on standalone# Fix permissions...commentsHow Has This Been Tested?
hadolint --config ./ci/hadolint-config.yamlon all 52 workbench Dockerfiles (0 errors)Self checklist (all need to be checked):
make test(gmakeon macOS) before asking for reviewDockerfile.konfluxfiles should be done inodh/notebooksand automatically synced torhds/notebooks. For Konflux-specific changes, modifyDockerfile.konfluxfiles directly inrhds/notebooksas these require special attention in the downstream repository and flow to the upcoming RHOAI release.Merge criteria:
Made with Cursor