From 80dcaddbfecaffb18da65dd01cd39c130e685562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rok=20Ro=C5=A1kar?= Date: Wed, 20 Dec 2023 18:26:07 +0100 Subject: [PATCH] chore: finalize image updates (#211) --- R-minimal/Dockerfile | 2 +- bioc-minimal/Dockerfile | 6 +++--- julia-minimal/Dockerfile | 2 +- minimal/Dockerfile | 2 +- pinned-image/.renku/renku.ini | 2 +- pinned-image/Dockerfile | 6 +++--- python-minimal/Dockerfile | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/R-minimal/Dockerfile b/R-minimal/Dockerfile index 18149ca..2452e99 100644 --- a/R-minimal/Dockerfile +++ b/R-minimal/Dockerfile @@ -6,7 +6,7 @@ FROM renku/renkulab-r:4.3.1-0.21.0 as builder # 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={{ __renku_version__ | default("1.11.2") }} +ARG RENKU_VERSION={{ __renku_version__ | default("2.7.0") }} # Install renku from pypi or from github if a dev version RUN if [ -n "$RENKU_VERSION" ] ; then \ diff --git a/bioc-minimal/Dockerfile b/bioc-minimal/Dockerfile index 013a78d..f2b9721 100644 --- a/bioc-minimal/Dockerfile +++ b/bioc-minimal/Dockerfile @@ -1,12 +1,12 @@ ######################################################## # Renku install section - do not edit # -FROM renku/renkulab-bioc:RELEASE_3_17-0.18.1 as builder +FROM renku/renkulab-bioc:RELEASE_3_17-0.21.0 as builder # 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={{ __renku_version__ | default("1.11.2") }} +ARG RENKU_VERSION={{ __renku_version__ | default("2.7.0") }} # Install renku from pypi or from github if a dev version RUN if [ -n "$RENKU_VERSION" ] ; then \ @@ -25,7 +25,7 @@ RUN if [ -n "$RENKU_VERSION" ] ; then \ # End Renku install section # ######################################################## -FROM renku/renkulab-bioc:RELEASE_3_17-0.18.1 +FROM renku/renkulab-bioc:RELEASE_3_17-0.21.0 # Uncomment and adapt if code is to be included in the image # COPY src /code/src diff --git a/julia-minimal/Dockerfile b/julia-minimal/Dockerfile index 710e156..1f01da1 100644 --- a/julia-minimal/Dockerfile +++ b/julia-minimal/Dockerfile @@ -6,7 +6,7 @@ FROM renku/renkulab-julia:1.9.0-0.21.0 as builder # 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={{ __renku_version__ | default("1.11.2") }} +ARG RENKU_VERSION={{ __renku_version__ | default("2.7.0") }} # Install renku from pypi or from github if a dev version RUN if [ -n "$RENKU_VERSION" ] ; then \ diff --git a/minimal/Dockerfile b/minimal/Dockerfile index faf2902..66d6930 100644 --- a/minimal/Dockerfile +++ b/minimal/Dockerfile @@ -6,7 +6,7 @@ FROM renku/renkulab-py:3.10-0.21.0 as builder # 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={{ __renku_version__ | default("1.11.2") }} +ARG RENKU_VERSION={{ __renku_version__ | default("2.7.0") }} # Install renku from pypi or from github if a dev version RUN if [ -n "$RENKU_VERSION" ] ; then \ diff --git a/pinned-image/.renku/renku.ini b/pinned-image/.renku/renku.ini index 55e6c1b..da7d0eb 100644 --- a/pinned-image/.renku/renku.ini +++ b/pinned-image/.renku/renku.ini @@ -1,3 +1,3 @@ [interactive] default_url = /lab -image = renku/renkulab-py:{{ python_version | default("3.10") }}-0.20.0 +image = renku/renkulab-py:3.10-0.21.0 diff --git a/pinned-image/Dockerfile b/pinned-image/Dockerfile index bc763a5..4cb9131 100644 --- a/pinned-image/Dockerfile +++ b/pinned-image/Dockerfile @@ -1,12 +1,12 @@ ######################################################## # Renku install section - do not edit # -FROM renku/renkulab-py:{{ python_version | default("3.10") }}-0.20.0 as builder +FROM renku/renkulab-py:3.10-0.21.0 as builder # 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={{ __renku_version__ | default("1.11.2") }} +ARG RENKU_VERSION={{ __renku_version__ | default("2.7.0") }} # Install renku from pypi or from github if a dev version RUN if [ -n "$RENKU_VERSION" ] ; then \ @@ -29,7 +29,7 @@ RUN if [ -n "$RENKU_VERSION" ] ; then \ # wait for the image to build and then update the pinned image in .renku/renku.ini or # via the Settings panel in Renkulab. -FROM renku/renkulab-py:{{ python_version | default("3.10") }}-0.20.0 +FROM renku/renkulab-py:3.10-0.21.0 COPY --from=builder ${HOME}/.renku/venv ${HOME}/.renku/venv diff --git a/python-minimal/Dockerfile b/python-minimal/Dockerfile index 5e477cb..59d6b00 100644 --- a/python-minimal/Dockerfile +++ b/python-minimal/Dockerfile @@ -6,7 +6,7 @@ FROM renku/renkulab-py:3.10-0.21.0 as builder # 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={{ __renku_version__ | default("1.11.2") }} +ARG RENKU_VERSION={{ __renku_version__ | default("2.7.0") }} # Install renku from pypi or from github if a dev version RUN if [ -n "$RENKU_VERSION" ] ; then \