From fa9dcf1f470b15e6affeff17c042c47489883c42 Mon Sep 17 00:00:00 2001 From: Gavin Lee Date: Wed, 9 Jun 2021 15:47:10 +0200 Subject: [PATCH] docs: Update README.md (#162) * Update README.md attemps to address #159 * remove cuda9.2 * update readme * revert vnc and julia to py:latest * fix build argument for julia --- .../workflows/build_and_push_to_docker.yml | 3 +- README.md | 34 ++++++++-------- docker/cuda9.2/Dockerfile | 39 ------------------- docker/julia/Dockerfile | 2 +- docker/vnc/Dockerfile | 2 +- 5 files changed, 21 insertions(+), 59 deletions(-) delete mode 100644 docker/cuda9.2/Dockerfile diff --git a/.github/workflows/build_and_push_to_docker.yml b/.github/workflows/build_and_push_to_docker.yml index d7f4713e..21dba13f 100644 --- a/.github/workflows/build_and_push_to_docker.yml +++ b/.github/workflows/build_and_push_to_docker.yml @@ -44,7 +44,6 @@ jobs: fail-fast: true matrix: EXTENSIONS: - - cuda9.2 - cuda-tf - vnc @@ -100,7 +99,7 @@ jobs: export DOCKER_TAG="$JULIAVERSION-$LABEL" docker build docker/julia \ - --build-arg RENKU_BASE="$DOCKER_NAME-py:3.8-$LABEL" \ + --build-arg BASE_IMAGE="$DOCKER_NAME-py:3.8-$LABEL" \ --tag $DOCKER_NAME-julia:$DOCKER_TAG docker push $DOCKER_NAME-julia:$DOCKER_TAG env: diff --git a/README.md b/README.md index 33cf1975..468ab404 100644 --- a/README.md +++ b/README.md @@ -77,6 +77,14 @@ pipx install --force renku== ## Current images +### Recent releases and the corresponding versions + +| Release | Release Date | Python | R | Julia | Bioconductor | Cuda TF | +|---------|--------------|--------|--------------|-------|--------------|---------| +| [0.7.6](https://github.com/SwissDataScienceCenter/renkulab-docker/releases/tag/0.7.6) | 10 May 2021 | [3.8](https://hub.docker.com/r/renku/renkulab-py/tags?page=1&ordering=last_updated&name=0.7.6) | [4.0.3](https://hub.docker.com/r/renku/renkulab-r/tags?page=1&ordering=last_updated&name=4.0.3-0.7.6), [4.0.4](https://hub.docker.com/r/renku/renkulab-r/tags?page=1&ordering=last_updated&name=4.0.4-0.7.6) | [1.6.1](https://hub.docker.com/r/renku/renkulab-julia/tags?page=1&ordering=last_updated&name=1.6.1-0.7.6) | [3.11](https://hub.docker.com/r/renku/renkulab-bioc/tags?page=1&ordering=last_updated&name=RELEASE_3_11-0.7.6), [3.12](https://hub.docker.com/r/renku/renkulab-bioc/tags?page=1&ordering=last_updated&name=RELEASE_3_12-0.7.6) | [CUDA 11.0.3, TF 2.4](https://hub.docker.com/r/renku/renkulab-cuda-tf/tags?page=1&ordering=last_updated&name=0.7.6) | +| [0.7.5](https://github.com/SwissDataScienceCenter/renkulab-docker/releases/tag/0.7.5) | 6 Apr 2021 | [3.8](https://hub.docker.com/r/renku/renkulab-py/tags?page=1&ordering=last_updated&name=0.7.5) | [4.0.3](https://hub.docker.com/r/renku/renkulab-r/tags?page=1&ordering=last_updated&name=4.0.3-0.7.5), [4.0.4](https://hub.docker.com/r/renku/renkulab-r/tags?page=1&ordering=last_updated&name=4.0.4-0.7.5) | [1.5.3](https://hub.docker.com/r/renku/renkulab-julia/tags?page=1&ordering=last_updated&name=1.5.3-0.7.5) | [3.11](https://hub.docker.com/r/renku/renkulab-bioc/tags?page=1&ordering=last_updated&name=RELEASE_3_11-0.7.5), [3.12](https://hub.docker.com/r/renku/renkulab-bioc/tags?page=1&ordering=last_updated&name=RELEASE_3_12-0.7.5) | [CUDA 11.0.3, TF 2.4](https://hub.docker.com/r/renku/renkulab-cuda-tf/tags?page=1&ordering=last_updated&name=0.7.5) | +| [0.7.4](https://github.com/SwissDataScienceCenter/renkulab-docker/releases/tag/0.7.4) | 10 Feb 2021 | [3.7](https://hub.docker.com/r/renku/renkulab-py/tags?page=1&ordering=last_updated&name=0.7.4) | [4.0.0](https://hub.docker.com/r/renku/renkulab-r/tags?page=1&ordering=last_updated&name=4.0.0-0.7.4) | [1.5.3](https://hub.docker.com/r/renku/renkulab-julia/tags?page=1&ordering=last_updated&name=1.5.3-0.7.4) | [3.11](https://hub.docker.com/r/renku/renkulab-bioc/tags?page=1&ordering=last_updated&name=RELEASE_3_11-0.7.4), [3.12](https://hub.docker.com/r/renku/renkulab-bioc/tags?page=1&ordering=last_updated&name=RELEASE_3_12-0.7.4) | - | + ### py **Available via renku project templates** @@ -85,8 +93,6 @@ The basic Jupyter image with minimal dependencies. Based on https://hub.docker.c dockerhub: https://hub.docker.com/r/renku/renkulab-py/tags -Currently with python 3.7. - ### r **Available via renku project templates** @@ -99,38 +105,34 @@ simply replace `/lab` or `/tree` with `/rstudio` in the URL. dockerhub: https://hub.docker.com/r/renku/renkulab-r/tags -Several versions of R are available, including the latest, 4.0.0. - ### julia **Available via renku project templates** -Based on the renkulab-py (python 3.7) image with julia installed. +Based on the renkulab-py (python 3.8) image with julia installed. dockerhub: https://hub.docker.com/r/renku/renkulab-julia/tags -Currently with julia 1.5.3 - ### bioc +**Available via renku project templates** + Based on the bioconductor Docker image: https://github.com/Bioconductor/bioconductor_docker. dockerhub: https://hub.docker.com/r/renku/renkulab-bioc/tags -Currently with bioconductor 3_11, 3_10 & devel. - -### cuda9.2 - -Based on the py3.7 image with CUDA 9.2 installed. +### cuda-tf -dockerhub: https://hub.docker.com/r/renku/renkulab-cuda9.2/tags +Based on the renkulab-py (python 3.8) with CUDA 11.0.3 and Tensorflow 2.4 installed. -### cuda10.0-tf1.14 +dockerhub: https://hub.docker.com/r/renku/renkulab-cuda-tf/tags -Based on the py3.7 with CUDA 10.0 and Tensorflow 1.14 installed. +### vnc -dockerhub: https://hub.docker.com/r/renku/renkulab-cuda10.0-tf1.14/tags +Based on the renkulab-py (python 3.8) with a full virtual desktop installed. +It uses noVNC 1.1.0 and TigerVNC 1.9.0 with a Renku UI to deliver a Linux desktop. +https://hub.docker.com/r/renku/renkulab-vnc/tags ## Development diff --git a/docker/cuda9.2/Dockerfile b/docker/cuda9.2/Dockerfile deleted file mode 100644 index 0129d847..00000000 --- a/docker/cuda9.2/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -ARG BASE_IMAGE=renku/renkulab-py:latest -FROM $BASE_IMAGE - -LABEL maintainer="Swiss Data Science Center " - -# Install cuda -# From: https://gitlab.com/nvidia/cuda/blob/ubuntu18.04/9.2/base/Dockerfile -USER root -RUN apt-get update && apt-get install -y --no-install-recommends gnupg2 curl ca-certificates && \ - curl -fsSL https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1710/x86_64/7fa2af80.pub | apt-key add - && \ - echo "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1710/x86_64 /" > /etc/apt/sources.list.d/cuda.list && \ - echo "deb https://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1604/x86_64 /" > /etc/apt/sources.list.d/nvidia-ml.list && \ - apt-get purge --autoremove -y curl && \ - rm -rf /var/lib/apt/lists/* - -# Compatible with NVIDIA graphics driver R396.37 and higher ; known to work with cuDNN v7.1.2 -ENV CUDA_VERSION 9.2.148 - -ENV CUDA_PKG_VERSION 9-2=$CUDA_VERSION-1 -RUN apt-get update && apt-get install -y --no-install-recommends \ - cuda-cudart-$CUDA_PKG_VERSION && \ - ln -s cuda-9.2 /usr/local/cuda && \ - rm -rf /var/lib/apt/lists/* - -# nvidia-docker 1.0 -LABEL com.nvidia.volumes.needed="nvidia_driver" -LABEL com.nvidia.cuda.version="${CUDA_VERSION}" - -RUN echo "/usr/local/nvidia/lib" >> /etc/ld.so.conf.d/nvidia.conf && \ - echo "/usr/local/nvidia/lib64" >> /etc/ld.so.conf.d/nvidia.conf - -ENV PATH /usr/local/nvidia/bin:/usr/local/cuda/bin:${PATH} -ENV LD_LIBRARY_PATH /usr/local/nvidia/lib:/usr/local/nvidia/lib64 - -# nvidia-container-runtime -ENV NVIDIA_VISIBLE_DEVICES all -ENV NVIDIA_DRIVER_CAPABILITIES compute,utility -ENV NVIDIA_REQUIRE_CUDA "cuda>=9.2" -USER $NB_USER diff --git a/docker/julia/Dockerfile b/docker/julia/Dockerfile index 53845ee2..4656870b 100644 --- a/docker/julia/Dockerfile +++ b/docker/julia/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=renku/renkulab-py:3.8-0.7.5 +ARG BASE_IMAGE=renku/renkulab-py:latest FROM $BASE_IMAGE as base LABEL maintainer="Swiss Data Science Center " diff --git a/docker/vnc/Dockerfile b/docker/vnc/Dockerfile index edb8b0cf..81d7cd11 100644 --- a/docker/vnc/Dockerfile +++ b/docker/vnc/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=renku/renkulab-py:3.8-0.7.6 +ARG BASE_IMAGE=renku/renkulab-py:latest FROM ${BASE_IMAGE} LABEL maintainer="Swiss Data Science Center "