From 60c642a0d6169c2010613f94bb24ee98eb5b58fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rok=20Ro=C5=A1kar?= <roskarr@ethz.ch>
Date: Thu, 9 Mar 2023 23:56:20 +0100
Subject: [PATCH] feat: add rclone and modify shell prompt (#314)

---
 docker/batch/Dockerfile    | 2 +-
 docker/generic/Dockerfile  | 1 +
 docker/py/Dockerfile       | 8 ++------
 docker/py/powerline.config | 1 +
 docker/r/Dockerfile        | 1 +
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/docker/batch/Dockerfile b/docker/batch/Dockerfile
index a2c1ebac..4a50ae97 100644
--- a/docker/batch/Dockerfile
+++ b/docker/batch/Dockerfile
@@ -12,7 +12,7 @@ SHELL [ "/bin/bash", "-c", "-o", "pipefail" ]
 
 # install dependencies
 RUN apt-get update -y && \
-    apt-get install --no-install-recommends -y curl wget git && \
+    apt-get install --no-install-recommends -y curl wget git rclone && \
     apt-get purge && \
     apt-get clean && \
     apt-get autoremove --yes && \
diff --git a/docker/generic/Dockerfile b/docker/generic/Dockerfile
index 7e1f0226..ebeab8c8 100644
--- a/docker/generic/Dockerfile
+++ b/docker/generic/Dockerfile
@@ -33,6 +33,7 @@ RUN apt-get update --fix-missing && \
     libsm6 \
     libxext6 \
     libxrender1 \
+    rclone \
     tini \
     wget \
     vim && \
diff --git a/docker/py/Dockerfile b/docker/py/Dockerfile
index e0aaf296..8754a49a 100644
--- a/docker/py/Dockerfile
+++ b/docker/py/Dockerfile
@@ -24,6 +24,7 @@ RUN apt-get update && apt-get install -yq --no-install-recommends \
     musl-dev \
     nano \
     netcat \
+    rclone \
     unzip \
     vim \
     openssh-server && \
@@ -82,12 +83,7 @@ RUN mkdir -p "$HOME/.renku/bin" && \
     source "$HOME/.renku/venv/bin/activate" && \
     pip install --no-cache-dir -r /tmp/renku-requirements.txt && \
     deactivate && \
-    ln -s "$HOME/.renku/venv/bin/renku" "$HOME/.renku/bin/renku" && \
-    echo $'if (tty -s); then\n\
-    source ~/.renku/venv/bin/activate\n\
-    export PATH=/opt/conda/bin:$PATH\n\
-fi\n\
-'>> "/home/${NB_USER}/.bashrc"
+    ln -s "$HOME/.renku/venv/bin/renku" "$HOME/.renku/bin/renku" 
 
 # configure git
 COPY git-config.bashrc /home/$NB_USER/
diff --git a/docker/py/powerline.config b/docker/py/powerline.config
index 998ef0b2..a92bb34b 100644
--- a/docker/py/powerline.config
+++ b/docker/py/powerline.config
@@ -1,5 +1,6 @@
 {
   "segments": [
+    "ssh",
     "virtual_env",
     "cwd",
     "git",
diff --git a/docker/r/Dockerfile b/docker/r/Dockerfile
index 82bc4bb1..0b43b147 100644
--- a/docker/r/Dockerfile
+++ b/docker/r/Dockerfile
@@ -64,6 +64,7 @@ RUN apt-get update --fix-missing && \
     libxext6 \
     libxrender1 \
     libzmq3-dev \
+    rclone \
     vim && \
     apt-get purge && \
     apt-get clean && \