diff --git a/docker/kasm/Dockerfile b/docker/kasm/Dockerfile index 7680ec036671d86581cebd6ce1beb2fac9612dfa..8348ce8c78b5a059ace8baa9a02f33dab36baa7e 100644 --- a/docker/kasm/Dockerfile +++ b/docker/kasm/Dockerfile @@ -60,13 +60,7 @@ RUN if [ "$SPYDER" = true ] ; then apt-get install -y python3-spyder; fi # === Install anaconda === # RUN if [ "$ANACONDA" = true ] ; then \ wget https://repo.anaconda.com/archive/${ANACONDA_VERS}-Linux-x86_64.sh; \ - bash ${ANACONDA_VERS}-Linux-x86_64.sh -b; \ - chmod u+x $HOME/anaconda3/etc/profile.d/conda.sh; \ - echo "source ~/anaconda3/etc/profile.d/conda.sh" >> /home/kasm-user/.bashrc; \ - echo "conda activate" >> /home/kasm-user/.bashrc; \ - rm -rf $HOME/.cache; \ - rm ${ANACONDA_VERS}-Linux-x86_64.sh; \ - fi +fi # === Install QGIS === # RUN if [ "$QGIS" = true ] ; then \ diff --git a/docker/kasm/custom_startup.sh b/docker/kasm/custom_startup.sh index 1defef1655a9b87995ec88e3772adc049b4ac433..2d69e9408406e594a89e09be4c1b203696fd5470 100755 --- a/docker/kasm/custom_startup.sh +++ b/docker/kasm/custom_startup.sh @@ -1,8 +1,6 @@ #!/bin/bash VNC_HOME=/home/kasm-user -sed -i -e "s@kasm-default-profile@kasm-user@g" ~/anaconda3/etc/profile.d/conda.sh - # Add changepassword icon mkdir -p $VNC_HOME/Desktop cat <<EOF > $VNC_HOME/Desktop/users.desktop @@ -23,6 +21,11 @@ Terminal=true Icon=$VNC_HOME/anaconda3/lib/python3.8/site-packages/anaconda_navigator/static/images/anaconda.png Exec=$VNC_HOME/anaconda3/bin/anaconda-navigator eof + +if [ -z "$(grep 'conda init' $VNC_HOME/.bashrc)" ]; then + bash /install/Anaconda3-*.sh -b + $VNC_HOME/anaconda3/bin/conda init +fi fi if [ $SPYDER == 'true' ]; then