From cb2958d4c94da534c4d9e24db96a579b67e9d290 Mon Sep 17 00:00:00 2001
From: John Kyros <79665180+jkyros@users.noreply.github.com>
Date: Wed, 8 Mar 2023 19:31:23 -0600
Subject: [PATCH] Dockerfile: Fix removing extensions for fcos/scos

Last minute change in #3496 resulted in the number being removed from
the end of the `rhel-coros-8/9` image, it is now just simply in there as
`rhel-coreos`, and as a result the regex that was scraping out the
extensions images (because fcos/scos dont' ship them) no longer works.

This adjusts the sed command in the Dockerfile so it matches again now
that the number is missing, and the extensions are properly removed.
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 6e32cfa446..fefe8d57b8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@ COPY install /manifests
 
 RUN if [[ "${TAGS}" == "fcos" ]] || [[ "${TAGS}" == "scos" ]]; then \
     # comment out non-base/extensions image-references entirely for fcos/scos
-    sed -i '/- name: rhel-coreos-[89]-/,+3 s/^/#/' /manifests/image-references && \
+    sed -i '/- name: rhel-coreos-/,+3 s/^/#/' /manifests/image-references && \
     # also remove extensions from the osimageurl configmap (if we don't, oc won't rewrite it, and the placeholder value will survive and get used)
     sed -i '/baseOSExtensionsContainerImage:/ s/^/#/' /manifests/0000_80_machine-config-operator_05_osimageurl.yaml; fi && \
     # rewrite image names for fcos/scos