Merge pull request #331 from jstourac/downHadolint2023b

[fix] hadolint warnings to base and rstudio Dockerfiles
red-hat-data-services · Aug 28, 2024 · 89044ee · 89044ee
2 parents 772a772 + 1d8c6ae
commit 89044ee
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/base/rhel9-python-3.9/Dockerfile b/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

diff --git a/rstudio/rhel9-python-3.9/Dockerfile b/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.06.1-524-x86_64.rpm && \
+RUN wget --progress=dot:giga https://download2.rstudio.org/server/rhel9/x86_64/rstudio-server-rhel-2023.06.1-524-x86_64.rpm && \
     yum install -y rstudio-server-rhel-2023.06.1-524-x86_64.rpm && \
     rm rstudio-server-rhel-2023.06.1-524-x86_64.rpm && \
     yum -y clean all  --enablerepo='*'
@@ -69,7 +69,8 @@ RUN chmod 1777 /var/run/rstudio-server && \
 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-*"
+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"]