From 458ef7d33a78284f54db12f80b3441fb9d7c8172 Mon Sep 17 00:00:00 2001
From: Tasko Olevski <tasko.olevski@sdsc.ethz.ch>
Date: Wed, 6 Oct 2021 12:49:33 +0000
Subject: [PATCH] chore: update Dockerfile to fix failing image builds
---
Dockerfile | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 9272044..c8aa194 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
+########################################################
--
GitLab