Merge pull request #517 from andyatmiami/refactor/rhel9-images

feat(containers): Remove reliance on "chained builds" architecture for rhel9 image builds

Author: openshift-merge-bot[bot]

base/rhel9-python-3.11/Dockerfile

@@ -58,11 +58,8 @@ spec:
   strategy:
     type: Docker
     dockerStrategy:
-      dockerfilePath: "cuda/rhel9-python-3.11/Dockerfile"
+      dockerfilePath: "rstudio/rhel9-python-3.11/Dockerfile.cuda"
       noCache: true
-      from:
-        kind: "DockerImage"
-        name: "quay.io/modh/odh-base-rhel9@sha256:1d6f2e3c0ee7962d92c3b933f3bbfabeee24d314a2ce5f8ec2d9f18d5b6723d4"
       volumes:
         - name: secret-mvn
           source:
@@ -106,7 +103,7 @@ spec:
   strategy:
     type: Docker
     dockerStrategy:
-      dockerfilePath: "rstudio/rhel9-python-3.11/Dockerfile"
+      dockerfilePath: "rstudio/rhel9-python-3.11/Dockerfile.cuda"
       noCache: true
       from:
         kind: "ImageStreamTag"

cuda/rhel9-python-3.11/Dockerfile

@@ -43,10 +43,7 @@ spec:
   strategy:
     type: Docker
     dockerStrategy:
-      from:
-        kind: "DockerImage"
-        name: "quay.io/modh/odh-base-rhel9@sha256:1d6f2e3c0ee7962d92c3b933f3bbfabeee24d314a2ce5f8ec2d9f18d5b6723d4"
-      dockerfilePath: "rstudio/rhel9-python-3.11/Dockerfile"
+      dockerfilePath: "rstudio/rhel9-python-3.11/Dockerfile.cpu"
       volumes:
         - name: secret-mvn
           source:

manifests/base/cuda-rstudio-buildconfig.yaml

@@ -1,6 +1,36 @@
-ARG BASE_IMAGE
-FROM ${BASE_IMAGE}
+#####################
+# base              #
+#####################
+FROM registry.redhat.io/rhel9/python-311:latest AS base
 
+WORKDIR /opt/app-root/bin
+
+# Install micropipenv to deploy packages from Pipfile.lock
+RUN pip install --no-cache-dir -U "micropipenv[toml]"
+
+# OS Packages needs to be installed as root
+USER root
+
+# Install usefull OS packages
+RUN dnf install -y mesa-libGL && dnf clean all && rm -rf /var/cache/yum
+
+# Other apps and tools installed as default user
+USER 1001
+
+# Install the oc client
+RUN curl -L https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/stable/openshift-client-linux.tar.gz \
+        -o /tmp/openshift-client-linux.tar.gz && \
+    tar -xzvf /tmp/openshift-client-linux.tar.gz oc && \
+    rm -f /tmp/openshift-client-linux.tar.gz
+
+WORKDIR /opt/app-root/src
+
+#####################
+# rstudio      #
+#####################
+FROM base AS rstudio
+
+ARG RSTUDIO_SOURCE_CODE=rstudio/rhel9-python-3.11
 # Access the client's secret for the subscription manager from the environment variable
 ARG SECRET_DIR=/opt/app-root/src/.sec
 ARG SERVERURL_DEFAULT=""
@@ -18,7 +48,7 @@ LABEL name="odh-notebook-rstudio-server-rhel9-python-3.11" \
 
 USER 0
 
-# uncomment the bellow 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.
+# 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
 
 # Run the subscription manager command using the provided credentials. Only include --serverurl and --baseurl if they are provided
@@ -49,11 +79,11 @@ RUN yum install -y yum-utils && \
 
 # set R library to default (used in install.r from littler)
 RUN chmod -R a+w /usr/lib64/R/library
-ENV LIBLOC /usr/lib64/R/library
+ENV LIBLOC=/usr/lib64/R/library
 
 # set User R Library path
 RUN mkdir -p /opt/app-root/bin/Rpackages/4.4 && chmod -R a+w /opt/app-root/bin/Rpackages/4.4
-ENV R_LIBS_USER /opt/app-root/bin/Rpackages/4.4
+ENV R_LIBS_USER=/opt/app-root/bin/Rpackages/4.4
 
 WORKDIR /tmp/
 
@@ -66,7 +96,7 @@ RUN wget --progress=dot:giga https://download2.rstudio.org/server/rhel9/x86_64/r
 # Specific RStudio config and fixes
 RUN chmod 1777 /var/run/rstudio-server && \
     mkdir -p /usr/share/doc/R
-COPY rstudio/rhel9-python-3.11/rsession.conf /etc/rstudio/rsession.conf
+COPY ${RSTUDIO_SOURCE_CODE}/rsession.conf /etc/rstudio/rsession.conf
 
 # package installation
 # install necessary texlive-framed package to make Knit R markup to PDF rendering possible
@@ -94,10 +124,10 @@ RUN yum -y module enable nginx:$NGINX_VERSION && \
     nginx -v 2>&1 | grep -qe "nginx/$NGINX_VERSION\." && echo "Found VERSION $NGINX_VERSION" && \
     yum -y clean all --enablerepo='*'
 
-COPY --chown=1001:0 rstudio/rhel9-python-3.11/supervisord/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+COPY --chown=1001:0 ${RSTUDIO_SOURCE_CODE}/supervisord/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 
 # Copy extra files to the image.
-COPY rstudio/rhel9-python-3.11/nginx/root/ /
+COPY ${RSTUDIO_SOURCE_CODE}/nginx/root/ /
 
 # Changing ownership and user rights to support following use-cases:
 # 1) running container on OpenShift, whose default security model
@@ -128,21 +158,30 @@ RUN sed -i -f ${NGINX_APP_ROOT}/nginxconf.sed ${NGINX_CONF_PATH} && \
     rpm-file-permissions
 
 # Configure nginx
-COPY rstudio/rhel9-python-3.11/nginx/serverconf/ /opt/app-root/etc/nginx.default.d/
-COPY rstudio/rhel9-python-3.11/nginx/httpconf/ /opt/app-root/etc/nginx.d/
-COPY rstudio/rhel9-python-3.11/nginx/api/ /opt/app-root/api/
+COPY ${RSTUDIO_SOURCE_CODE}/nginx/serverconf/ /opt/app-root/etc/nginx.default.d/
+COPY ${RSTUDIO_SOURCE_CODE}/nginx/httpconf/ /opt/app-root/etc/nginx.d/
+COPY ${RSTUDIO_SOURCE_CODE}/nginx/api/ /opt/app-root/api/
 
 # Launcher
 WORKDIR /opt/app-root/bin
 
-COPY rstudio/rhel9-python-3.11/utils utils/
-COPY rstudio/rhel9-python-3.11/run-rstudio.sh rstudio/rhel9-python-3.11/setup_rstudio.py rstudio/rhel9-python-3.11/rsession.sh rstudio/rhel9-python-3.11/run-nginx.sh ./
+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 subscription-manager remove --all && subscription-manager unregister && subscription-manager clean
 
-WORKDIR /opt/app-root/src
-
 USER 1001
 
+COPY ${RSTUDIO_SOURCE_CODE}/Pipfile.lock ./
+
+RUN echo "Installing softwares and packages" && \
+    micropipenv install && \
+    rm -f ./Pipfile.lock && \
+    # Fix permissions to support pip in Openshift environments \
+    chmod -R g+w /opt/app-root/lib/python3.11/site-packages && \
+    fix-permissions /opt/app-root -P
+
+WORKDIR /opt/app-root/src
+
 CMD ["/opt/app-root/bin/run-rstudio.sh"]