squashme: modify bashrc

SwissDataScienceCenter · Jan 12, 2023 · a8a6e9d · a8a6e9d
1 parent a6bdbc8
commit a8a6e9d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/docker/py/Dockerfile b/docker/py/Dockerfile
@@ -79,7 +79,12 @@ RUN mkdir -p "$HOME/.renku/bin" && \
     ssh-keygen -q -N "" -t dsa -f /opt/ssh/ssh_host_dsa_key && \
     ssh-keygen -q -N "" -t rsa -b 4096 -f /opt/ssh/ssh_host_rsa_key && \
     ssh-keygen -q -N "" -t ecdsa -f /opt/ssh/ssh_host_ecdsa_key && \
-    ssh-keygen -q -N "" -t ed25519 -f /opt/ssh/ssh_host_ed25519_key
+    ssh-keygen -q -N "" -t ed25519 -f /opt/ssh/ssh_host_ed25519_key && \
+    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
 
 # configure git
 COPY git-config.bashrc /home/$NB_USER/

diff --git a/docker/py/entrypoint.sh b/docker/py/entrypoint.sh
@@ -35,7 +35,7 @@ if [ -f "./post-init.sh" ]; then
 fi
 
 # Start the SHH daemon in the background
-/usr/sbin/sshd -D -f /opt/ssh/sshd_config -E /tmp/sshd.log &> /dev/null &
+/usr/sbin/sshd -f /opt/ssh/sshd_config -E /tmp/sshd.log &> /dev/null
 
 # run the command
 $@
diff --git a/docker/py/sshd_config b/docker/py/sshd_config
@@ -16,3 +16,5 @@ PidFile /opt/ssh/sshd.pid
 AcceptEnv LANG LC_*
 
 Subsystem       sftp    /usr/lib/openssh/sftp-server
+
+AuthorizedKeysFile     ~/.ssh/authorized_keys /.ssh/authorized_keys
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,3 +16,5 @@ PidFile /opt/ssh/sshd.pid
		AcceptEnv LANG LC_*

		Subsystem sftp /usr/lib/openssh/sftp-server

		AuthorizedKeysFile ~/.ssh/authorized_keys /.ssh/authorized_keys