Merge pull request #543 from rhmdnd/CMP-2693-use-correct-base-image-f…

…or-must-gather CMP-2693: Use CLI image for base image in must-gather
ComplianceAsCode · Jul 22, 2024 · e691a11 · e691a11
2 parents 46d1653 + c523213
commit e691a11
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/.github/workflows/must-gather-latest.yml b/.github/workflows/must-gather-latest.yml
@@ -15,6 +15,6 @@ jobs:
       name: must-gather-ocp
       registry_org: complianceascode
       tag: latest
-      dockerfile_path: images/must-gather/Dockerfile
+      dockerfile_path: images/must-gather/Dockerfile.ocp
       vendor: "Compliance Operator Authors"
       platforms: "linux/amd64,linux/ppc64le,linux/s390x"
diff --git a/Makefile b/Makefile
@@ -659,7 +659,7 @@ push-e2e-content: e2e-content-images  ## Build and push the e2e-content-images
 
 .PHONY: must-gather-image
 must-gather-image:  ## Build the must-gather image
-	$(RUNTIME) build -t $(MUST_GATHER_IMAGE_PATH):$(MUST_GATHER_IMAGE_TAG) -f images/must-gather/Dockerfile .
+	$(RUNTIME) build -t $(MUST_GATHER_IMAGE_PATH):$(MUST_GATHER_IMAGE_TAG) -f images/must-gather/Dockerfile.ocp .
 
 .PHONY: must-gather
 must-gather: must-gather-image must-gather-push  ## Build and push the must-gather image

diff --git a/images/must-gather/Dockerfile b/images/must-gather/Dockerfile
diff --git a/images/must-gather/Dockerfile.ocp b/images/must-gather/Dockerfile.ocp
@@ -0,0 +1,5 @@
+FROM registry.ci.openshift.org/ocp/4.17:cli
+
+COPY utils/must-gather/* /usr/bin/
+
+ENTRYPOINT /usr/bin/gather