Skip to content

Commit

Permalink
gather: Fix rsync of files from the must-gather pod
Browse files Browse the repository at this point in the history
OC cli expects the collection of a must-gather to be
inside `/must-gather` by default. See
[here](https://github.com/openshift/oc/blob/5110357c067c5933e75604504f1521927ccaaf27/pkg/cli/admin/mustgather/mustgather.go#L143C22-L143C35)

This patch also addresses an issue where all the files
present in the cwd of user building must-gather would
be copied into the image. Which was not ideal and might
include personal files.

Signed-off-by: Niraj Yadav <niryadav@redhat.com>
  • Loading branch information
black-dragon74 authored and openshift-cherrypick-robot committed Nov 8, 2024
1 parent ddd47a6 commit 3307662
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
FROM registry.ci.openshift.org/ocp/4.17:cli

WORKDIR /tmp
WORKDIR /usr/bin
COPY collection-scripts .

COPY . .

RUN mkdir -p /templates

COPY collection-scripts/* /usr/bin/
COPY templates/* /templates/
WORKDIR /
COPY templates ./templates

# We do not need it as of now
# jq is not preinstalled on openshift/origin-cli either
Expand Down

0 comments on commit 3307662

Please sign in to comment.