From ea648a63d5207ec7f3f17cb5b3d1ec1c81b92e64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rok=20Ro=C5=A1kar?= Date: Wed, 15 Jun 2022 01:01:10 +0200 Subject: [PATCH] use conda for now --- docker/py/Dockerfile | 8 -------- 1 file changed, 8 deletions(-) diff --git a/docker/py/Dockerfile b/docker/py/Dockerfile index cca975b4..6cb06058 100644 --- a/docker/py/Dockerfile +++ b/docker/py/Dockerfile @@ -62,7 +62,6 @@ RUN python3 -m pip install --no-cache-dir -U pip && \ # npm cache clean --force && \ rm -rf "/home/${NB_USER}/.cache" -<<<<<<< HEAD # jupyter sets channel priority to strict which often causes very long error messages RUN mamba config --system --set channel_priority flexible && \ mamba clean --all -f -y @@ -71,13 +70,6 @@ RUN mamba config --system --set channel_priority flexible && \ RUN mkdir -p "$HOME/.ssh" && \ touch "$HOME/.ssh/authorized_keys" && \ chmod u=rw,g=,o= "$HOME/.ssh/authorized_keys" -======= -# fix https://github.com/SwissDataScienceCenter/renku-jupyter/issues/14 -RUN mamba install -y gxx_linux-64 && \ - # jupyter sets channel priority to strict which often causes very long error messages - conda config --system --set channel_priority flexible && \ - mamba clean --all -f -y ->>>>>>> db03a95 (remove git-lfs=2.12.0 requirement) # install renku-python ENV RENKU_DISABLE_VERSION_CHECK 1