Skip to content

Commit

Permalink
docs: Update README.md (#162)
Browse files Browse the repository at this point in the history
* Update README.md

attemps to address #159

* remove cuda9.2

* update readme

* revert vnc and julia to py:latest

* fix build argument for julia
  • Loading branch information
gavin-k-lee authored Jun 9, 2021
1 parent a3294af commit fa9dcf1
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 59 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/build_and_push_to_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ jobs:
fail-fast: true
matrix:
EXTENSIONS:
- cuda9.2
- cuda-tf
- vnc

Expand Down Expand Up @@ -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:
Expand Down
34 changes: 18 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,14 @@ pipx install --force renku==<version>

## 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**
Expand All @@ -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**
Expand All @@ -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

Expand Down
39 changes: 0 additions & 39 deletions docker/cuda9.2/Dockerfile

This file was deleted.

2 changes: 1 addition & 1 deletion docker/julia/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"
Expand Down
2 changes: 1 addition & 1 deletion docker/vnc/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"
Expand Down

0 comments on commit fa9dcf1

Please sign in to comment.