Merge pull request #273 from jstourac/cherry-pick-179-to-release-2024a

[release-2024a] Cherry pick #179, #253 and #254 to release-2024a

Author: harshad16

base/rhel9-python-3.9/Dockerfile

@@ -13,7 +13,7 @@ LABEL name="rhoai-notebook-base-rhel9-python-3.9" \
 WORKDIR /opt/app-root/bin
 
 # Install micropipenv to deploy packages from Pipfile.lock
-RUN pip install -U "micropipenv[toml]"
+RUN pip install --no-cache-dir -U "micropipenv[toml]"
 
 # Install Python dependencies from Pipfile.lock file
 
@@ -24,7 +24,7 @@ RUN echo "Installing softwares and packages" && micropipenv install && rm -f ./P
 USER root
 
 # Install usefull OS packages
-RUN dnf install -y mesa-libGL
+RUN dnf install -y mesa-libGL && dnf clean all && rm -rf /var/cache/yum
 
 # Other apps and tools installed as default user
 USER 1001

ci/check-params-env.sh

@@ -25,7 +25,7 @@ PARAMS_ENV_PATH="manifests/base/params.env"
 
 # This value needs to be updated everytime we deliberately change number of the
 # images we want to have in the `params.env` file.
-EXPECTED_NUM_RECORDS=26
+EXPECTED_NUM_RECORDS=27
 
 # ---------------------------- DEFINED FUNCTIONS ----------------------------- #
 
@@ -185,7 +185,7 @@ function check_image_variable_matches_name_and_commitref() {
             ;;
         odh-habana-notebook-image-n)
             expected_name="odh-notebook-habana-jupyter-1.13.0-ubi8-python-3.8"
-            expected_commitref="2024a"
+            expected_commitref="release-2024a"
             expected_build_name="habana-jupyter-1.13.0-ubi8-python-3.8-amd64"
             ;;
         odh-habana-notebook-image-n-1)

manifests/base/kustomization.yaml

@@ -213,7 +213,7 @@ vars:
       name: notebooks-parameters
       apiVersion: v1
     fieldref:
-      fieldpath: data.odh-codeserver-notebook-n-1
+      fieldpath: data.odh-codeserver-notebook-image-n-1
   - name: odh-minimal-notebook-image-commit-n
     objref:
       kind: ConfigMap

manifests/base/params.env

@@ -23,5 +23,5 @@ odh-trustyai-notebook-image-n-1=quay.io/modh/odh-trustyai-notebook@sha256:926ed1
 odh-trustyai-notebook-image-n-2=quay.io/modh/odh-trustyai-notebook@sha256:8c5e653f6bc6a2050565cf92f397991fbec952dc05cdfea74b65b8fd3047c9d4
 odh-habana-notebook-image-n=quay.io/modh/odh-habana-notebooks@sha256:e300c9279587e93742d7cc9a982a286804ad6491f592e48ab6e4bba07c853b54
 odh-habana-notebook-image-n-1=quay.io/modh/odh-habana-notebooks@sha256:0f6ae8f0b1ef11896336e7f8611e77ccdb992b49a7942bf27e6bc64d73205d05
-odh-codeserver-notebook-n=quay.io/modh/codeserver@sha256:e682a0d2a3990525fb59de409664f3482f0a97bdfe7b440258da6a5b5617bddb
-odh-codeserver-notebook-n-1=quay.io/modh/codeserver@sha256:14b73e8a62b98fb9a70cb079b6048121ab0a7798fe1eca0adf06b6716f280115
+odh-codeserver-notebook-image-n=quay.io/modh/codeserver@sha256:e682a0d2a3990525fb59de409664f3482f0a97bdfe7b440258da6a5b5617bddb
+odh-codeserver-notebook-image-n-1=quay.io/modh/codeserver@sha256:14b73e8a62b98fb9a70cb079b6048121ab0a7798fe1eca0adf06b6716f280115

manifests/base/params.yaml

@@ -107,4 +107,4 @@ varReference:
   - path: spec/tags[]/from/name
     kind: ImageStream
     apiGroup: image.openshift.io/v1
-    name: odh-codeserver-notebook-n-1
+    name: odh-codeserver-notebook-image-n-1

rstudio/rhel9-python-3.9/Dockerfile

@@ -58,7 +58,7 @@ ENV R_LIBS_USER /opt/app-root/src/Rpackages/4.3
 WORKDIR /tmp/
 
 # Install RStudio
-RUN wget https://download2.rstudio.org/server/rhel9/x86_64/rstudio-server-rhel-2023.12.1-402-x86_64.rpm && \
+RUN wget --progress=dot:giga https://download2.rstudio.org/server/rhel9/x86_64/rstudio-server-rhel-2023.12.1-402-x86_64.rpm && \
     yum install -y rstudio-server-rhel-2023.12.1-402-x86_64.rpm && \
     rm rstudio-server-rhel-2023.12.1-402-x86_64.rpm && \
     yum -y clean all  --enablerepo='*'
@@ -68,8 +68,9 @@ RUN chmod 1777 /var/run/rstudio-server && \
     mkdir -p /usr/share/doc/R
 COPY rstudio/rhel9-python-3.9/rsession.conf /etc/rstudio/rsession.conf
 
-# package installation
-RUN dnf install -y libsodium-devel.x86_64 libgit2-devel.x86_64 libcurl-devel harfbuzz-devel.x86_64 fribidi-devel.x86_64 cmake "flexiblas-*"
+# package installation 
+RUN dnf install -y libsodium-devel.x86_64 libgit2-devel.x86_64 libcurl-devel harfbuzz-devel.x86_64 fribidi-devel.x86_64 cmake "flexiblas-*" && \
+    dnf clean all && rm -rf /var/cache/yum
 RUN R -e "install.packages('Rcpp')"
 
 # Install NGINX to proxy RStudio and pass probes check
@@ -142,4 +143,4 @@ WORKDIR /opt/app-root/src
 
 USER 1001
 
-CMD /opt/app-root/bin/run-rstudio.sh
+CMD ["/opt/app-root/bin/run-rstudio.sh"]