diff --git a/R-minimal/Dockerfile b/R-minimal/Dockerfile index ffca25b..f13cef7 100644 --- a/R-minimal/Dockerfile +++ b/R-minimal/Dockerfile @@ -1,6 +1,6 @@ # For finding latest versions of the base image see # https://github.com/SwissDataScienceCenter/renkulab-docker -ARG RENKU_BASE_IMAGE=renku/renkulab-r:4.0.5-0.10.0 +ARG RENKU_BASE_IMAGE=renku/renkulab-r:4.0.5-0.10.1 FROM ${RENKU_BASE_IMAGE} # Uncomment and adapt if code is to be included in the image @@ -35,14 +35,15 @@ ARG RENKU_VERSION={{ __renku_version__ | default("0.16.0") }} # Install renku from pypi or from github if it's a dev version RUN if [ -n "$RENKU_VERSION" ] ; then \ - currentversion=$(pipx list | sed -n "s/^\s*package\srenku\s\([^,]\+\),.*$/\1/p") ; \ + source .renku/venv/bin/activate ; \ + currentversion=$(renku --version) ; \ if [ "$RENKU_VERSION" != "$currentversion" ] ; then \ - pipx uninstall renku ; \ - gitversion=$(echo "$RENKU_VERSION" | sed -n "s/^[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+\(\.dev[[:digit:]]\+\)*\(+g\([a-f0-9]\+\)\)*\(+dirty\)*$/\3/p"); \ + 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 \ - pipx install --force "git+https://github.com/SwissDataScienceCenter/renku-python.git@$gitversion" ;\ + pip install --force "git+https://github.com/SwissDataScienceCenter/renku-python.git@$gitversion" ;\ else \ - pipx install --force renku==${RENKU_VERSION} ;\ + pip install --force renku==${RENKU_VERSION} ;\ fi \ fi \ fi diff --git a/bioc-minimal/Dockerfile b/bioc-minimal/Dockerfile index 85c5d9b..52071e4 100644 --- a/bioc-minimal/Dockerfile +++ b/bioc-minimal/Dockerfile @@ -1,6 +1,6 @@ # see https://github.com/SwissDataScienceCenter/renkulab-docker # to swap this image for the latest version available -FROM renku/renkulab-bioc:RELEASE_3_12-0.10.0 +FROM renku/renkulab-bioc:RELEASE_3_12-0.10.1 # Uncomment and adapt if code is to be included in the image # COPY src /code/src @@ -34,14 +34,15 @@ ARG RENKU_VERSION={{ __renku_version__ | default("0.16.0") }} # Install renku from pypi or from github if it's a dev version RUN if [ -n "$RENKU_VERSION" ] ; then \ - currentversion=$(pipx list | sed -n "s/^\s*package\srenku\s\([^,]\+\),.*$/\1/p") ; \ + source .renku/venv/bin/activate ; \ + currentversion=$(renku --version) ; \ if [ "$RENKU_VERSION" != "$currentversion" ] ; then \ - pipx uninstall renku ; \ - gitversion=$(echo "$RENKU_VERSION" | sed -n "s/^[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+\(\.dev[[:digit:]]\+\)*\(+g\([a-f0-9]\+\)\)*\(+dirty\)*$/\3/p"); \ + 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 \ - pipx install --force "git+https://github.com/SwissDataScienceCenter/renku-python.git@$gitversion" ;\ + pip install --force "git+https://github.com/SwissDataScienceCenter/renku-python.git@$gitversion" ;\ else \ - pipx install --force renku==${RENKU_VERSION} ;\ + pip install --force renku==${RENKU_VERSION} ;\ fi \ fi \ fi diff --git a/julia-minimal/Dockerfile b/julia-minimal/Dockerfile index 2bf2492..6ee675a 100644 --- a/julia-minimal/Dockerfile +++ b/julia-minimal/Dockerfile @@ -1,6 +1,6 @@ # For finding latest versions of the base image see # https://github.com/SwissDataScienceCenter/renkulab-docker -ARG RENKU_BASE_IMAGE=renku/renkulab-julia:1.6.1-0.10.0 +ARG RENKU_BASE_IMAGE=renku/renkulab-julia:1.6.1-0.10.1 FROM ${RENKU_BASE_IMAGE} # Uncomment and adapt if code is to be included in the image @@ -40,14 +40,15 @@ ARG RENKU_VERSION={{ __renku_version__ | default("0.16.0") }} # Install renku from pypi or from github if it's a dev version RUN if [ -n "$RENKU_VERSION" ] ; then \ - currentversion=$(pipx list | sed -n "s/^\s*package\srenku\s\([^,]\+\),.*$/\1/p") ; \ + source .renku/venv/bin/activate ; \ + currentversion=$(renku --version) ; \ if [ "$RENKU_VERSION" != "$currentversion" ] ; then \ - pipx uninstall renku ; \ - gitversion=$(echo "$RENKU_VERSION" | sed -n "s/^[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+\(\.dev[[:digit:]]\+\)*\(+g\([a-f0-9]\+\)\)*\(+dirty\)*$/\3/p"); \ + 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 \ - pipx install --force "git+https://github.com/SwissDataScienceCenter/renku-python.git@$gitversion" ;\ + pip install --force "git+https://github.com/SwissDataScienceCenter/renku-python.git@$gitversion" ;\ else \ - pipx install --force renku==${RENKU_VERSION} ;\ + pip install --force renku==${RENKU_VERSION} ;\ fi \ fi \ fi diff --git a/minimal/Dockerfile b/minimal/Dockerfile index 788bbe3..c4908a9 100644 --- a/minimal/Dockerfile +++ b/minimal/Dockerfile @@ -1,6 +1,6 @@ # For finding latest versions of the base image see # https://github.com/SwissDataScienceCenter/renkulab-docker -ARG RENKU_BASE_IMAGE=renku/renkulab-py:3.9-0.10.0 +ARG RENKU_BASE_IMAGE=renku/renkulab-py:3.9-0.10.1 FROM ${RENKU_BASE_IMAGE} # Uncomment and adapt if code is to be included in the image @@ -39,14 +39,15 @@ ARG RENKU_VERSION={{ __renku_version__ | default("0.16.0") }} # Install renku from pypi or from github if it's a dev version RUN if [ -n "$RENKU_VERSION" ] ; then \ - currentversion=$(pipx list | sed -n "s/^\s*package\srenku\s\([^,]\+\),.*$/\1/p") ; \ + source .renku/venv/bin/activate ; \ + currentversion=$(renku --version) ; \ if [ "$RENKU_VERSION" != "$currentversion" ] ; then \ - pipx uninstall renku ; \ - gitversion=$(echo "$RENKU_VERSION" | sed -n "s/^[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+\(\.dev[[:digit:]]\+\)*\(+g\([a-f0-9]\+\)\)*\(+dirty\)*$/\3/p"); \ + 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 \ - pipx install --force "git+https://github.com/SwissDataScienceCenter/renku-python.git@$gitversion" ;\ + pip install --force "git+https://github.com/SwissDataScienceCenter/renku-python.git@$gitversion" ;\ else \ - pipx install --force renku==${RENKU_VERSION} ;\ + pip install --force renku==${RENKU_VERSION} ;\ fi \ fi \ fi diff --git a/python-minimal/Dockerfile b/python-minimal/Dockerfile index 7d0c620..34fb460 100644 --- a/python-minimal/Dockerfile +++ b/python-minimal/Dockerfile @@ -1,6 +1,6 @@ # For finding latest versions of the base image see # https://github.com/SwissDataScienceCenter/renkulab-docker -ARG RENKU_BASE_IMAGE=renku/renkulab-py:3.9-0.10.0 +ARG RENKU_BASE_IMAGE=renku/renkulab-py:3.9-0.10.1 FROM ${RENKU_BASE_IMAGE} # Uncomment and adapt if code is to be included in the image @@ -34,14 +34,15 @@ ARG RENKU_VERSION={{ __renku_version__ | default("0.16.0") }} # Install renku from pypi or from github if it's a dev version RUN if [ -n "$RENKU_VERSION" ] ; then \ - currentversion=$(pipx list | sed -n "s/^\s*package\srenku\s\([^,]\+\),.*$/\1/p") ; \ + source .renku/venv/bin/activate ; \ + currentversion=$(renku --version) ; \ if [ "$RENKU_VERSION" != "$currentversion" ] ; then \ - pipx uninstall renku ; \ - gitversion=$(echo "$RENKU_VERSION" | sed -n "s/^[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+\(\.dev[[:digit:]]\+\)*\(+g\([a-f0-9]\+\)\)*\(+dirty\)*$/\3/p"); \ + 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 \ - pipx install --force "git+https://github.com/SwissDataScienceCenter/renku-python.git@$gitversion" ;\ + pip install --force "git+https://github.com/SwissDataScienceCenter/renku-python.git@$gitversion" ;\ else \ - pipx install --force renku==${RENKU_VERSION} ;\ + pip install --force renku==${RENKU_VERSION} ;\ fi \ fi \ fi