From 2e7e967401fdcd7d4fef8e65dddd261ec0daa2fd Mon Sep 17 00:00:00 2001 From: Bryan Brancotte <bryan.brancotte@pasteur.fr> Date: Wed, 19 Jun 2024 10:20:02 +0200 Subject: [PATCH] rework image list into a separated csv file --- source/user_guide/configure_image.rst | 16 +++++++--------- source/user_guide/image-list.csv | 12 ++++++++++++ source/user_guide/image_list.rst | 2 ++ 3 files changed, 21 insertions(+), 9 deletions(-) create mode 100644 source/user_guide/image-list.csv create mode 100644 source/user_guide/image_list.rst diff --git a/source/user_guide/configure_image.rst b/source/user_guide/configure_image.rst index f0ca3d7..8845cf5 100644 --- a/source/user_guide/configure_image.rst +++ b/source/user_guide/configure_image.rst @@ -105,17 +105,15 @@ The ``FROM ...`` indicate which base image should be used, the image contains: * python's or R "shiny" package * the shiny-server -We provide various version of R and Python for your needs, here is a list -(as of september 2023). +.. include:: image_list.rst -* registry-gitlab.pasteur.fr/hub/shiny-k8s/r:3.6.3 -* registry-gitlab.pasteur.fr/hub/shiny-k8s/r:4.2.3 -* registry-gitlab.pasteur.fr/hub/shiny-k8s/r:4.3.1 -* registry-gitlab.pasteur.fr/hub/shiny-k8s/python:3.9-slim-bullseye -* registry-gitlab.pasteur.fr/hub/shiny-k8s/python:3.10-slim-bullseye -* registry-gitlab.pasteur.fr/hub/shiny-k8s/python:3.11-slim-bullseye +.. csv-table:: Image generated along with base os, R/python version, and shiny-server version + :file: image-list.csv + :header-rows: 1 -Up to date list can be found in https://gitlab.pasteur.fr/hub/shiny-k8s/container_registry +Translation between ubuntu name and version can be found at https://wiki.ubuntu.com/Releases. +Translation between debian name and version can be found at https://www.debian.org/releases/ +An up to date list can be found in https://gitlab.pasteur.fr/hub/shiny-k8s/container_registry For more details about base images, please see the dedicated pages for :ref:`python <base image dockefile python>` and :ref:`R <base image dockefile r>`. diff --git a/source/user_guide/image-list.csv b/source/user_guide/image-list.csv new file mode 100644 index 0000000..369dc47 --- /dev/null +++ b/source/user_guide/image-list.csv @@ -0,0 +1,12 @@ +built image,base os,R/Python,shiny-server +registry-gitlab.pasteur.fr/hub/shiny-k8s/r:3.6.3,jammy,3.6.3,latest +registry-gitlab.pasteur.fr/hub/shiny-k8s/r:4.2.3,jammy,4.2.3,latest +registry-gitlab.pasteur.fr/hub/shiny-k8s/r:4.3.1,jammy,4.3.1,latest +registry-gitlab.pasteur.fr/hub/shiny-k8s/python:3.9-slim, bookworm, 3.9,latest +registry-gitlab.pasteur.fr/hub/shiny-k8s/python:3.10-slim, bookworm, 3.10,latest +registry-gitlab.pasteur.fr/hub/shiny-k8s/python:3.11-slim, bookworm, 3.11,latest +registry-gitlab.pasteur.fr/hub/shiny-k8s/python:3.9-slim-bullseye, bullseye, 3.9,latest +registry-gitlab.pasteur.fr/hub/shiny-k8s/python:3.10-slim-bullseye, bullseye, 3.10,latest +registry-gitlab.pasteur.fr/hub/shiny-k8s/python:3.11-slim-bullseye, bullseye, 3.11,latest +...values are from sept 2023,,, +...fresh should be fetched from ci artifact,,, \ No newline at end of file diff --git a/source/user_guide/image_list.rst b/source/user_guide/image_list.rst new file mode 100644 index 0000000..b8eec95 --- /dev/null +++ b/source/user_guide/image_list.rst @@ -0,0 +1,2 @@ +We provide various version of R and Python for your needs, here is a list +(as of %%date%%). \ No newline at end of file -- GitLab