Add zshell support on docker. (#8)

Author: JeiKeiLim

Dockerfile

@@ -64,3 +64,20 @@ RUN rm requirements.txt requirements-dev.txt
 # Add PATH
 RUN echo "export PATH=/home/user/.local/bin:\$PATH" >> /home/user/.bashrc
 RUN echo "export LC_ALL=C.UTF-8 && export LANG=C.UTF-8" >> /home/user/.bashrc
+
+# Install zsh with powerlevel10k theme
+ARG USE_ZSH=true
+
+RUN sudo apt-get install -y zsh && \
+    sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended && \
+    git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k
+COPY res/.zshrc res/.p10k.zsh /home/user/
+RUN sudo chown user:user .zshrc .p10k.zsh
+
+RUN if [ "$USE_ZSH" = "true" ]; then \
+    sudo chsh -s $(which zsh) $(whoami) && \
+    echo "\n# Custom settings" >> /home/user/.zshrc && \
+    echo "export PATH=/home/user/.local/bin:\$PATH" >> /home/user/.zshrc && \
+    echo "export LC_ALL=C.UTF-8 && export LANG=C.UTF-8" >> /home/user/.zshrc; \
+    fi
+

run_docker.sh

@@ -17,15 +17,26 @@ DOCKER_TAG=$ORG/$PRJ_NAME
 CMD_ARGS=( ${@} )
 CMD_ARGS=${CMD_ARGS[*]:1}
 
+RUN_SHELL=/usr/bin/zsh
+
 if [[ $2 == :* ]]; then
     DOCKER_TAG=$DOCKER_TAG$2
     CMD_ARGS=${CMD_ARGS[*]:2}
+elif [ "$2" = "bash" ]; then
+    RUN_SHELL=/bin/bash
+ $RUN_SHELL   CMD_ARGS=${CMD_ARGS[*]:2}
 fi
 
 if [ "$1" = "build" ]; then
+    if [ "$RUN_SHELL" = "/bin/bash" ]; then
+        CMD_ARGS="$CMD_ARGS --build-arg USE_ZSH=false"
+    fi
     echo "Building a docker image with tagname $DOCKER_TAG and arguments $CMD_ARGS"
     docker build . -t $DOCKER_TAG $CMD_ARGS --build-arg UID=`id -u` --build-arg GID=`id -g`
 elif [ "$1" = "run" ]; then
+    if test -f "$HOME/.gitconfig"; then
+        CMD_ARGS="$CMD_ARGS -v $HOME/.gitconfig:/home/user/.gitconfig"
+    fi
     echo "Run a docker image with tagname $DOCKER_TAG and arguments $CMD_ARGS"
 
     docker run -tid --privileged --gpus all \
@@ -36,18 +47,18 @@ elif [ "$1" = "run" ]; then
         -v $PWD:/home/user/$PRJ_NAME \
         --network host \
         $CMD_ARGS \
-        $DOCKER_TAG /bin/bash
+        $DOCKER_TAG $RUN_SHELL
 
     last_cont_id=$(docker ps -qn 1)
     echo $(docker ps -qn 1) > $PWD/.last_exec_cont_id.txt
 
-    docker exec -ti $last_cont_id /bin/bash
+    docker exec -ti $last_cont_id $RUN_SHELL
 elif [ "$1" = "exec" ]; then
     echo "Execute the last docker container"
 
     last_cont_id=$(tail -1 $PWD/.last_exec_cont_id.txt)
     docker start ${last_cont_id}
-    docker exec -ti ${last_cont_id} /bin/bash
+    docker exec -ti ${last_cont_id} $RUN_SHELL
 else
     echo ""
     echo "============= $0 [Usages] ============"