diff --git a/Dockerfile b/Dockerfile index 927204491836958f70c1d3a345cdd04a3ea117d0..c8aa194173286eac0f17ac3a1b9be6e45c40c8e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,14 +27,24 @@ RUN conda env update -q -f /tmp/environment.yml && \ # RENKU_VERSION determines the version of the renku CLI # that will be used in this image. To find the latest version, # visit https://pypi.org/project/renku/#history. -ARG RENKU_VERSION=0.15.1 +ARG RENKU_VERSION=0.16.2 ######################################################## # Do not edit this section and do not add anything below +# Install renku from pypi or from github if it's a dev version RUN if [ -n "$RENKU_VERSION" ] ; then \ - pipx uninstall renku && \ - pipx install --force renku==${RENKU_VERSION} \ - ; fi + source .renku/venv/bin/activate ; \ + currentversion=$(renku --version) ; \ + if [ "$RENKU_VERSION" != "$currentversion" ] ; then \ + pip uninstall renku ; \ + gitversion=$(echo "$RENKU_VERSION" | sed -n "s/^[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+\(\.dev[[:digit:]]\+\)*\(+g\([a-f0-9]\+\)\)*\(+dirty\)*$/\3/p") ; \ + if [ -n "$gitversion" ] ; then \ + pip install --force "git+https://github.com/SwissDataScienceCenter/renku-python.git@$gitversion" ;\ + else \ + pip install --force renku==${RENKU_VERSION} pyshacl==0.17.0.post1 ;\ + fi \ + fi \ + fi -######################################################## \ No newline at end of file +########################################################