Merge pull request #28660 from bmcelvee/BZ1848870

Bug 1848870 update the sample Satellite repository configuration

Author: bmcelvee

cicd/builds/running-entitled-builds.adoc

@@ -14,7 +14,7 @@ include::modules/builds-source-secrets-entitlements.adoc[leveloffset=+1]
 
 include::modules/builds-strategy-docker-entitled-subman.adoc[leveloffset=+2]
 
-== Running builds with Satellite subscriptions
+== Running builds with Red Hat Satellite subscriptions
 
 include::modules/builds-source-input-satellite-config.adoc[leveloffset=+2]
 

modules/builds-source-input-satellite-config.adoc

@@ -3,9 +3,9 @@
 //* builds/running-entitled-builds.adoc
 
 [id="builds-source-input-satellite-config_{context}"]
-= Adding Satellite configurations to builds
+= Adding Red Hat Satellite configurations to builds
 
-Builds that use Satellite to install content must provide appropriate configurations to obtain content from Satellite repositories.
+Builds that use Red Hat Satellite to install content must provide appropriate configurations to obtain content from Satellite repositories.
 
 .Prerequisites
 

modules/builds-strategy-docker-entitled-satellite.adoc

@@ -2,9 +2,9 @@
 //* builds/running-entitled-builds.adoc
 
 [id="builds-strategy-docker-entitled-satellite_{context}"]
-= Docker builds using Satellite subscriptions
+= Docker builds using Red Hat Satellite subscriptions
 
-Docker strategy builds can use Satellite repositories to install subscription content.
+Docker strategy builds can use Red Hat Satellite repositories to install subscription content.
 
 .Prerequisites
 
@@ -23,6 +23,10 @@ COPY ./etc-pki-entitlement /etc/pki/entitlement
 # Copy repository configuration
 COPY ./yum.repos.d /etc/yum.repos.d
 # Delete /etc/rhsm-host to use entitlements from the build container
+RUN sed -i".org" -e "s#^enabled=1#enabled=0#g" /etc/yum/pluginconf.d/subscription-manager.conf <1>
+#RUN cat /etc/yum/pluginconf.d/subscription-manager.conf
+RUN yum clean all
+#RUN yum-config-manager
 RUN rm /etc/rhsm-host && \
     # yum repository info provided by Satellite
     yum -y update && \
@@ -33,3 +37,4 @@ RUN rm /etc/rhsm-host && \
 USER 1001
 ENTRYPOINT ["/bin/bash"]
 ----
+<1> If adding Satellite configurations to builds using `enabled=1` fails, add `RUN sed -i".org" -e "s#^enabled=1#enabled=0#g" /etc/yum/pluginconf.d/subscription-manager.conf` to the Dockerfile.