Skip to content

Commit

Permalink
Revert "Bump must-gather to el9"
Browse files Browse the repository at this point in the history
This reverts commit 1f8c57b.

Signed-off-by: Liran Rotenberg <[email protected]>
  • Loading branch information
liranr23 committed Nov 7, 2023
1 parent bab5dcc commit 2aaef22
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM quay.io/openshift/origin-must-gather:4.13 as builder
FROM quay.io/openshift/origin-must-gather:4.10 as builder

FROM registry.access.redhat.com/ubi9-minimal
RUN echo -ne "[centos-9-stream-appstream]\nname = CentOS 9 Stream (RPMs) - AppStream\nbaseurl = https://mirror.stream.centos.org/9-stream/AppStream/x86_64/os/\nenabled = 1\ngpgcheck = 0" > /etc/yum.repos.d/centos.repo
FROM registry.access.redhat.com/ubi8-minimal
RUN echo -ne "[centos-8-stream-appstream]\nname = CentOS 8 Stream (RPMs) - AppStream\nbaseurl = http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/\nenabled = 1\ngpgcheck = 0" > /etc/yum.repos.d/centos.repo

RUN microdnf -y install rsync tar gzip graphviz jq findutils

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
IMAGE_REGISTRY ?= quay.io
IMAGE_TAG ?= latest
IMAGE_NAME ?= kubev2v/forklift-must-gather
IMAGE_NAME ?= konveyor/forklift-must-gather
CONTAINER_ENGINE ?= $(shell if [ -e /usr/bin/podman ]; then echo "/usr/bin/podman"; else echo "docker"; fi)

PROMETHEUS_LOCAL_DATA_DIR ?= /tmp/mig-prometheus-data-dump
Expand Down

0 comments on commit 2aaef22

Please sign in to comment.