fixup! RHOAIENG-21668: chore(gha): implement the rhel building on pull_request_trigger workflow

Author: jiridanek

rstudio/rhel9-python-3.11/Dockerfile.cpu

@@ -48,14 +48,11 @@ LABEL name="odh-notebook-rstudio-server-rhel9-python-3.11" \
 
 USER 0
 
-# Check if we are already entitled
-RUN subscription-manager status || touch /var/tmp/.subscription-initially-not-present
-
 # uncomment the below line if you fall on this error: subscription-manager is disabled when running inside a container. Please refer to your host system for subscription management.
 #RUN sed -i 's/\(def in_container():\)/\1\n    return False/g' /usr/lib64/python*/*-packages/rhsm/config.py
 
 # If necessary, run the subscription manager command using the provided credentials. Only include --serverurl and --baseurl if they are provided
-RUN [ ! -f '/var/tmp/.subscription-initially-not-present' ] || \
+RUN [ -d "${SECRET_DIR}" ] && \
     (SERVERURL=$(cat ${SECRET_DIR}/SERVERURL 2>/dev/null || echo ${SERVERURL_DEFAULT}) && \
     BASEURL=$(cat ${SECRET_DIR}/BASEURL 2>/dev/null || echo ${BASEURL_DEFAULT}) && \
     USERNAME=$(cat ${SECRET_DIR}/USERNAME) && \
@@ -173,7 +170,7 @@ COPY ${RSTUDIO_SOURCE_CODE}/utils utils/
 COPY ${RSTUDIO_SOURCE_CODE}/run-rstudio.sh ${RSTUDIO_SOURCE_CODE}/setup_rstudio.py ${RSTUDIO_SOURCE_CODE}/rsession.sh ${RSTUDIO_SOURCE_CODE}/run-nginx.sh ./
 
 # Unregister the system
-RUN [ ! -f '/var/tmp/.subscription-initially-not-present' ] || (subscription-manager remove --all && subscription-manager unregister && subscription-manager clean)
+RUN [ -d "${SECRET_DIR}" ] && (subscription-manager remove --all && subscription-manager unregister && subscription-manager clean)
 
 USER 1001
 

rstudio/rhel9-python-3.11/Dockerfile.cuda

@@ -41,11 +41,8 @@ ARG BASEURL_DEFAULT=""
 USER 0
 WORKDIR /opt/app-root/bin
 
-# Check if we are already entitled
-RUN subscription-manager status || touch /var/tmp/.subscription-initially-not-present
-
 # If necessary, run the subscription manager command using the provided credentials. Only include --serverurl and --baseurl if they are provided
-RUN [ ! -f '/var/tmp/.subscription-initially-not-present' ] || \
+RUN [ -d "${SECRET_DIR}" ] && \
     (SERVERURL=$(cat ${SECRET_DIR}/SERVERURL 2>/dev/null || echo ${SERVERURL_DEFAULT}) && \
     BASEURL=$(cat ${SECRET_DIR}/BASEURL 2>/dev/null || echo ${BASEURL_DEFAULT}) && \
     USERNAME=$(cat ${SECRET_DIR}/USERNAME) && \
@@ -169,7 +166,7 @@ RUN yum -y install cuda-toolkit-12-4 && \
     yum -y clean all --enablerepo="*"
 
 # Unregister the system
-RUN [ ! -f '/var/tmp/.subscription-initially-not-present' ] || (subscription-manager remove --all && subscription-manager unregister && subscription-manager clean)
+RUN [ -d "${SECRET_DIR}" ] && (subscription-manager remove --all && subscription-manager unregister && subscription-manager clean)
 
 # Restore notebook user workspace
 USER 1001
@@ -198,14 +195,11 @@ LABEL name="odh-notebook-rstudio-server-rhel9-python-3.11" \
 
 USER 0
 
-# Check if we are already entitled
-RUN subscription-manager status || touch /var/tmp/.subscription-initially-not-present
-
 # uncomment the below line if you fall on this error: subscription-manager is disabled when running inside a container. Please refer to your host system for subscription management.
 #RUN sed -i 's/\(def in_container():\)/\1\n    return False/g' /usr/lib64/python*/*-packages/rhsm/config.py
 
 # If necessary, run the subscription manager command using the provided credentials. Only include --serverurl and --baseurl if they are provided
-RUN [ ! -f '/var/tmp/.subscription-initially-not-present' ] || \
+RUN [ -d "${SECRET_DIR}" ] && \
     (SERVERURL=$(cat ${SECRET_DIR}/SERVERURL 2>/dev/null || echo ${SERVERURL_DEFAULT}) && \
     BASEURL=$(cat ${SECRET_DIR}/BASEURL 2>/dev/null || echo ${BASEURL_DEFAULT}) && \
     USERNAME=$(cat ${SECRET_DIR}/USERNAME) && \
@@ -323,7 +317,7 @@ COPY ${RSTUDIO_SOURCE_CODE}/utils utils/
 COPY ${RSTUDIO_SOURCE_CODE}/run-rstudio.sh ${RSTUDIO_SOURCE_CODE}/setup_rstudio.py ${RSTUDIO_SOURCE_CODE}/rsession.sh ${RSTUDIO_SOURCE_CODE}/run-nginx.sh ./
 
 # Unregister the system
-RUN [ ! -f '/var/tmp/.subscription-initially-not-present' ] || (subscription-manager remove --all && subscription-manager unregister && subscription-manager clean)
+RUN [ -d "${SECRET_DIR}" ] && (subscription-manager remove --all && subscription-manager unregister && subscription-manager clean)
 
 USER 1001