From 12e70507e6fc3c0f03d2b37a2385419f1aa21a81 Mon Sep 17 00:00:00 2001
From: antoniochavesgarcia <chaves@uma.es>
Date: Thu, 27 Jun 2024 11:18:29 +0200
Subject: [PATCH] feat (JupyterHub): Added zsh and different utils.

---
 .../base-cuda12.2-cudnn8-py3.11/Dockerfile    | 20 ++++++++++++++++---
 jupyterhub/base-py3.11/Dockerfile             | 19 +++++++++++++++---
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/jupyterhub/base-cuda12.2-cudnn8-py3.11/Dockerfile b/jupyterhub/base-cuda12.2-cudnn8-py3.11/Dockerfile
index 6ba995e..687af53 100644
--- a/jupyterhub/base-cuda12.2-cudnn8-py3.11/Dockerfile
+++ b/jupyterhub/base-cuda12.2-cudnn8-py3.11/Dockerfile
@@ -26,7 +26,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     tini \
     wget \
     dnsutils \
+    zip \
     unzip \
+    python3.10-venv \
+    htop \
+    atop \
+    jq \
+    zsh \
     && \    
     apt-get clean && rm -rf /var/lib/apt/lists/* && \
     echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
@@ -65,7 +71,7 @@ ARG NB_GID="100"
 
 # Fix: https://github.com/hadolint/hadolint/wiki/DL4006
 # Fix: https://github.com/koalaman/shellcheck/wiki/SC3014
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+SHELL ["/bin/zsh", "-o", "pipefail", "-c"]
 
 USER root
 
@@ -85,15 +91,23 @@ RUN echo "auth requisite pam_deny.so" >> /etc/pam.d/su && \
     chmod g+w /etc/passwd && \
     fix-permissions "${HOME}"
 
-RUN chsh -s /bin/bash
+RUN chsh -s /bin/zsh
 
 USER ${NB_UID}
 
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+RUN chsh -s /bin/zsh
+
+SHELL ["/bin/zsh", "-o", "pipefail", "-c"]
 
 RUN <<EOF
     echo "alias ls='eza'" >> ~/.bashrc
     echo "alias cat='batcat'" >> ~/.bashrc
 EOF
 
+
+RUN <<EOF
+    echo "alias ls='eza'" >> ~/.zshrc
+    echo "alias cat='batcat'" >> ~/.zshrc
+EOF
+
 WORKDIR "${HOME}"
diff --git a/jupyterhub/base-py3.11/Dockerfile b/jupyterhub/base-py3.11/Dockerfile
index 0abaa7c..c4ffdc8 100644
--- a/jupyterhub/base-py3.11/Dockerfile
+++ b/jupyterhub/base-py3.11/Dockerfile
@@ -26,7 +26,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     tini \
     wget \
     dnsutils \
+    zip \
     unzip \
+    python3.10-venv \
+    htop \
+    atop \
+    jq \
+    zsh \
     && \    
     apt-get clean && rm -rf /var/lib/apt/lists/* && \
     echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
@@ -65,7 +71,7 @@ ARG NB_GID="100"
 
 # Fix: https://github.com/hadolint/hadolint/wiki/DL4006
 # Fix: https://github.com/koalaman/shellcheck/wiki/SC3014
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+SHELL ["/bin/zsh", "-o", "pipefail", "-c"]
 
 USER root
 
@@ -85,15 +91,22 @@ RUN echo "auth requisite pam_deny.so" >> /etc/pam.d/su && \
     chmod g+w /etc/passwd && \
     fix-permissions "${HOME}"
 
-RUN chsh -s /bin/bash
+RUN chsh -s /bin/zsh
 
 USER ${NB_UID}
 
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+RUN chsh -s /bin/zsh
+
+SHELL ["/bin/zsh", "-o", "pipefail", "-c"]
 
 RUN <<EOF
     echo "alias ls='eza'" >> ~/.bashrc
     echo "alias cat='batcat'" >> ~/.bashrc
 EOF
 
+RUN <<EOF
+    echo "alias ls='eza'" >> ~/.zshrc
+    echo "alias cat='batcat'" >> ~/.zshrc
+EOF
+
 WORKDIR "${HOME}"