From 7a650c7cf8eba7e6a426e7fb22586d53dc80f0d9 Mon Sep 17 00:00:00 2001 From: eitsupi <50911393+eitsupi@users.noreply.github.com> Date: Mon, 10 Feb 2025 13:41:29 +0900 Subject: [PATCH] refactor!: remove files for `rocker/cuda`, `rocker/ml`, and `rocker/ml-verse` (#905) Close #903 Close #756 --- NEWS.md | 7 + bakefiles/4.4.1.extra.docker-bake.json | 105 ----------- bakefiles/4.4.2.extra.docker-bake.json | 177 ------------------ build/scripts/generate-bakefiles.R | 36 +--- build/scripts/generate-dockerfiles.R | 3 - build/scripts/generate-matrix.R | 2 +- .../bakefiles/extra.docker-bake.json | 40 +--- .../templates/dockerfiles/cuda.Dockerfile.txt | 40 ---- .../dockerfiles/ml-verse.Dockerfile.txt | 71 ------- build/templates/dockerfiles/ml.Dockerfile.txt | 64 ------- dockerfiles/cuda_4.3.3.Dockerfile | 33 ---- dockerfiles/cuda_4.4.1.Dockerfile | 40 ---- dockerfiles/cuda_4.4.2.Dockerfile | 40 ---- dockerfiles/cuda_devel.Dockerfile | 40 ---- dockerfiles/ml-verse_4.3.3.Dockerfile | 64 ------- dockerfiles/ml-verse_4.4.1.Dockerfile | 71 ------- dockerfiles/ml-verse_4.4.2.Dockerfile | 71 ------- dockerfiles/ml-verse_devel.Dockerfile | 71 ------- dockerfiles/ml_4.3.3.Dockerfile | 57 ------ dockerfiles/ml_4.4.1.Dockerfile | 64 ------- dockerfiles/ml_4.4.2.Dockerfile | 64 ------- dockerfiles/ml_devel.Dockerfile | 64 ------- tests/rocker_scripts/matrix.json | 9 +- 23 files changed, 11 insertions(+), 1222 deletions(-) delete mode 100644 build/templates/dockerfiles/cuda.Dockerfile.txt delete mode 100644 build/templates/dockerfiles/ml-verse.Dockerfile.txt delete mode 100644 build/templates/dockerfiles/ml.Dockerfile.txt delete mode 100644 dockerfiles/cuda_4.3.3.Dockerfile delete mode 100644 dockerfiles/cuda_4.4.1.Dockerfile delete mode 100644 dockerfiles/cuda_4.4.2.Dockerfile delete mode 100644 dockerfiles/cuda_devel.Dockerfile delete mode 100644 dockerfiles/ml-verse_4.3.3.Dockerfile delete mode 100644 dockerfiles/ml-verse_4.4.1.Dockerfile delete mode 100644 dockerfiles/ml-verse_4.4.2.Dockerfile delete mode 100644 dockerfiles/ml-verse_devel.Dockerfile delete mode 100644 dockerfiles/ml_4.3.3.Dockerfile delete mode 100644 dockerfiles/ml_4.4.1.Dockerfile delete mode 100644 dockerfiles/ml_4.4.2.Dockerfile delete mode 100644 dockerfiles/ml_devel.Dockerfile diff --git a/NEWS.md b/NEWS.md index c9323b85..7e513f9c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,12 @@ # News +## 2025-02 + +### Changes in pre-built images + +- `rocker/cuda`, `rocker/ml`, and `rocker/ml-verse` images are no longer built from this repository. + See [#903](https://github.com/rocker-org/rocker-versioned2/issues/903) for background. + ## 2024-12 ### Changes in pre-built images diff --git a/bakefiles/4.4.1.extra.docker-bake.json b/bakefiles/4.4.1.extra.docker-bake.json index d3ba5f57..b6332fbb 100644 --- a/bakefiles/4.4.1.extra.docker-bake.json +++ b/bakefiles/4.4.1.extra.docker-bake.json @@ -4,9 +4,6 @@ "default": [ { "targets": [ - "cuda", - "ml", - "ml-verse", "binder" ] } @@ -17,15 +14,6 @@ "binder" ] } - ], - "cuda-images": [ - { - "targets": [ - "cuda", - "ml", - "ml-verse" - ] - } ] } ], @@ -56,99 +44,6 @@ "docker.io/rocker/binder:4.4.1", "ghcr.io/rocker-org/binder:4.4.1" ] - }, - "cuda": { - "dockerfile": "dockerfiles/cuda_4.4.1.Dockerfile", - "labels": { - "org.opencontainers.image.title": "rocker/cuda", - "org.opencontainers.image.description": "NVIDIA CUDA libraries added to Rocker image.", - "org.opencontainers.image.base.name": "docker.io/nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04", - "org.opencontainers.image.version": "R-4.4.1", - "org.opencontainers.image.licenses": "GPL-2.0-or-later", - "org.opencontainers.image.source": "https://github.com/rocker-org/rocker-versioned2", - "org.opencontainers.image.vendor": "Rocker Project", - "org.opencontainers.image.authors": "Carl Boettiger " - }, - "platforms": [ - "linux/amd64" - ], - "cache-to": [ - "type=inline" - ], - "tags": [ - "docker.io/rocker/cuda:4.4.1", - "ghcr.io/rocker-org/cuda:4.4.1" - ], - "cache-from": [ - "docker.io/rocker/cuda:4.4.1", - "ghcr.io/rocker-org/cuda:4.4.1", - "docker.io/rocker/ml:4.4.1", - "ghcr.io/rocker-org/ml:4.4.1", - "docker.io/rocker/ml-verse:4.4.1", - "ghcr.io/rocker-org/ml-verse:4.4.1" - ] - }, - "ml": { - "dockerfile": "dockerfiles/ml_4.4.1.Dockerfile", - "labels": { - "org.opencontainers.image.title": "rocker/ml", - "org.opencontainers.image.description": "Docker image with R + GPU support for machine learning libraries.", - "org.opencontainers.image.base.name": "docker.io/nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04", - "org.opencontainers.image.version": "R-4.4.1", - "org.opencontainers.image.licenses": "GPL-2.0-or-later", - "org.opencontainers.image.source": "https://github.com/rocker-org/rocker-versioned2", - "org.opencontainers.image.vendor": "Rocker Project", - "org.opencontainers.image.authors": "Carl Boettiger " - }, - "platforms": [ - "linux/amd64" - ], - "cache-to": [ - "type=inline" - ], - "tags": [ - "docker.io/rocker/ml:4.4.1", - "ghcr.io/rocker-org/ml:4.4.1" - ], - "cache-from": [ - "docker.io/rocker/cuda:4.4.1", - "ghcr.io/rocker-org/cuda:4.4.1", - "docker.io/rocker/ml:4.4.1", - "ghcr.io/rocker-org/ml:4.4.1", - "docker.io/rocker/ml-verse:4.4.1", - "ghcr.io/rocker-org/ml-verse:4.4.1" - ] - }, - "ml-verse": { - "dockerfile": "dockerfiles/ml-verse_4.4.1.Dockerfile", - "labels": { - "org.opencontainers.image.title": "rocker/ml-verse", - "org.opencontainers.image.description": "Docker image with R + GPU support for machine learning libraries, and many R packages.", - "org.opencontainers.image.base.name": "docker.io/nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04", - "org.opencontainers.image.version": "R-4.4.1", - "org.opencontainers.image.licenses": "GPL-2.0-or-later", - "org.opencontainers.image.source": "https://github.com/rocker-org/rocker-versioned2", - "org.opencontainers.image.vendor": "Rocker Project", - "org.opencontainers.image.authors": "Carl Boettiger " - }, - "platforms": [ - "linux/amd64" - ], - "cache-to": [ - "type=inline" - ], - "tags": [ - "docker.io/rocker/ml-verse:4.4.1", - "ghcr.io/rocker-org/ml-verse:4.4.1" - ], - "cache-from": [ - "docker.io/rocker/cuda:4.4.1", - "ghcr.io/rocker-org/cuda:4.4.1", - "docker.io/rocker/ml:4.4.1", - "ghcr.io/rocker-org/ml:4.4.1", - "docker.io/rocker/ml-verse:4.4.1", - "ghcr.io/rocker-org/ml-verse:4.4.1" - ] } } } diff --git a/bakefiles/4.4.2.extra.docker-bake.json b/bakefiles/4.4.2.extra.docker-bake.json index 7f1ba93e..3041bdcc 100644 --- a/bakefiles/4.4.2.extra.docker-bake.json +++ b/bakefiles/4.4.2.extra.docker-bake.json @@ -4,9 +4,6 @@ "default": [ { "targets": [ - "cuda", - "ml", - "ml-verse", "binder" ] } @@ -17,15 +14,6 @@ "binder" ] } - ], - "cuda-images": [ - { - "targets": [ - "cuda", - "ml", - "ml-verse" - ] - } ] } ], @@ -68,171 +56,6 @@ "docker.io/rocker/binder:latest", "ghcr.io/rocker-org/binder:latest" ] - }, - "cuda": { - "dockerfile": "dockerfiles/cuda_4.4.2.Dockerfile", - "labels": { - "org.opencontainers.image.title": "rocker/cuda", - "org.opencontainers.image.description": "NVIDIA CUDA libraries added to Rocker image.", - "org.opencontainers.image.base.name": "docker.io/nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04", - "org.opencontainers.image.version": "R-4.4.2", - "org.opencontainers.image.licenses": "GPL-2.0-or-later", - "org.opencontainers.image.source": "https://github.com/rocker-org/rocker-versioned2", - "org.opencontainers.image.vendor": "Rocker Project", - "org.opencontainers.image.authors": "Carl Boettiger " - }, - "platforms": [ - "linux/amd64" - ], - "cache-to": [ - "type=inline" - ], - "tags": [ - "docker.io/rocker/cuda:4.4.2", - "ghcr.io/rocker-org/cuda:4.4.2", - "docker.io/rocker/cuda:4.4", - "ghcr.io/rocker-org/cuda:4.4", - "docker.io/rocker/cuda:4", - "ghcr.io/rocker-org/cuda:4", - "docker.io/rocker/cuda:latest", - "ghcr.io/rocker-org/cuda:latest" - ], - "cache-from": [ - "docker.io/rocker/cuda:4.4.2", - "ghcr.io/rocker-org/cuda:4.4.2", - "docker.io/rocker/cuda:4.4", - "ghcr.io/rocker-org/cuda:4.4", - "docker.io/rocker/cuda:4", - "ghcr.io/rocker-org/cuda:4", - "docker.io/rocker/cuda:latest", - "ghcr.io/rocker-org/cuda:latest", - "docker.io/rocker/ml:4.4.2", - "ghcr.io/rocker-org/ml:4.4.2", - "docker.io/rocker/ml:4.4", - "ghcr.io/rocker-org/ml:4.4", - "docker.io/rocker/ml:4", - "ghcr.io/rocker-org/ml:4", - "docker.io/rocker/ml:latest", - "ghcr.io/rocker-org/ml:latest", - "docker.io/rocker/ml-verse:4.4.2", - "ghcr.io/rocker-org/ml-verse:4.4.2", - "docker.io/rocker/ml-verse:4.4", - "ghcr.io/rocker-org/ml-verse:4.4", - "docker.io/rocker/ml-verse:4", - "ghcr.io/rocker-org/ml-verse:4", - "docker.io/rocker/ml-verse:latest", - "ghcr.io/rocker-org/ml-verse:latest" - ] - }, - "ml": { - "dockerfile": "dockerfiles/ml_4.4.2.Dockerfile", - "labels": { - "org.opencontainers.image.title": "rocker/ml", - "org.opencontainers.image.description": "Docker image with R + GPU support for machine learning libraries.", - "org.opencontainers.image.base.name": "docker.io/nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04", - "org.opencontainers.image.version": "R-4.4.2", - "org.opencontainers.image.licenses": "GPL-2.0-or-later", - "org.opencontainers.image.source": "https://github.com/rocker-org/rocker-versioned2", - "org.opencontainers.image.vendor": "Rocker Project", - "org.opencontainers.image.authors": "Carl Boettiger " - }, - "platforms": [ - "linux/amd64" - ], - "cache-to": [ - "type=inline" - ], - "tags": [ - "docker.io/rocker/ml:4.4.2", - "ghcr.io/rocker-org/ml:4.4.2", - "docker.io/rocker/ml:4.4", - "ghcr.io/rocker-org/ml:4.4", - "docker.io/rocker/ml:4", - "ghcr.io/rocker-org/ml:4", - "docker.io/rocker/ml:latest", - "ghcr.io/rocker-org/ml:latest" - ], - "cache-from": [ - "docker.io/rocker/cuda:4.4.2", - "ghcr.io/rocker-org/cuda:4.4.2", - "docker.io/rocker/cuda:4.4", - "ghcr.io/rocker-org/cuda:4.4", - "docker.io/rocker/cuda:4", - "ghcr.io/rocker-org/cuda:4", - "docker.io/rocker/cuda:latest", - "ghcr.io/rocker-org/cuda:latest", - "docker.io/rocker/ml:4.4.2", - "ghcr.io/rocker-org/ml:4.4.2", - "docker.io/rocker/ml:4.4", - "ghcr.io/rocker-org/ml:4.4", - "docker.io/rocker/ml:4", - "ghcr.io/rocker-org/ml:4", - "docker.io/rocker/ml:latest", - "ghcr.io/rocker-org/ml:latest", - "docker.io/rocker/ml-verse:4.4.2", - "ghcr.io/rocker-org/ml-verse:4.4.2", - "docker.io/rocker/ml-verse:4.4", - "ghcr.io/rocker-org/ml-verse:4.4", - "docker.io/rocker/ml-verse:4", - "ghcr.io/rocker-org/ml-verse:4", - "docker.io/rocker/ml-verse:latest", - "ghcr.io/rocker-org/ml-verse:latest" - ] - }, - "ml-verse": { - "dockerfile": "dockerfiles/ml-verse_4.4.2.Dockerfile", - "labels": { - "org.opencontainers.image.title": "rocker/ml-verse", - "org.opencontainers.image.description": "Docker image with R + GPU support for machine learning libraries, and many R packages.", - "org.opencontainers.image.base.name": "docker.io/nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04", - "org.opencontainers.image.version": "R-4.4.2", - "org.opencontainers.image.licenses": "GPL-2.0-or-later", - "org.opencontainers.image.source": "https://github.com/rocker-org/rocker-versioned2", - "org.opencontainers.image.vendor": "Rocker Project", - "org.opencontainers.image.authors": "Carl Boettiger " - }, - "platforms": [ - "linux/amd64" - ], - "cache-to": [ - "type=inline" - ], - "tags": [ - "docker.io/rocker/ml-verse:4.4.2", - "ghcr.io/rocker-org/ml-verse:4.4.2", - "docker.io/rocker/ml-verse:4.4", - "ghcr.io/rocker-org/ml-verse:4.4", - "docker.io/rocker/ml-verse:4", - "ghcr.io/rocker-org/ml-verse:4", - "docker.io/rocker/ml-verse:latest", - "ghcr.io/rocker-org/ml-verse:latest" - ], - "cache-from": [ - "docker.io/rocker/cuda:4.4.2", - "ghcr.io/rocker-org/cuda:4.4.2", - "docker.io/rocker/cuda:4.4", - "ghcr.io/rocker-org/cuda:4.4", - "docker.io/rocker/cuda:4", - "ghcr.io/rocker-org/cuda:4", - "docker.io/rocker/cuda:latest", - "ghcr.io/rocker-org/cuda:latest", - "docker.io/rocker/ml:4.4.2", - "ghcr.io/rocker-org/ml:4.4.2", - "docker.io/rocker/ml:4.4", - "ghcr.io/rocker-org/ml:4.4", - "docker.io/rocker/ml:4", - "ghcr.io/rocker-org/ml:4", - "docker.io/rocker/ml:latest", - "ghcr.io/rocker-org/ml:latest", - "docker.io/rocker/ml-verse:4.4.2", - "ghcr.io/rocker-org/ml-verse:4.4.2", - "docker.io/rocker/ml-verse:4.4", - "ghcr.io/rocker-org/ml-verse:4.4", - "docker.io/rocker/ml-verse:4", - "ghcr.io/rocker-org/ml-verse:4", - "docker.io/rocker/ml-verse:latest", - "ghcr.io/rocker-org/ml-verse:latest" - ] } } } diff --git a/build/scripts/generate-bakefiles.R b/build/scripts/generate-bakefiles.R index d787be98..e1cb6ca6 100644 --- a/build/scripts/generate-bakefiles.R +++ b/build/scripts/generate-bakefiles.R @@ -161,40 +161,6 @@ write_extra_bakefile <- function(..., bakefile_template, path_template) { generate_versioned_tags() bake_json_content$target$binder$`cache-from` <- bake_json_content$target$binder$tags - ## cuda - bake_json_content$target$`cuda`$labels <- c( - bake_json_content$target$`cuda`$labels, - default_labels - ) - bake_json_content$target$`cuda`$tags <- c("docker.io/rocker/cuda", "ghcr.io/rocker-org/cuda") |> - generate_versioned_tags() - - ## ml - bake_json_content$target$ml$labels <- c( - bake_json_content$target$ml$labels, - default_labels - ) - bake_json_content$target$ml$tags <- c("docker.io/rocker/ml", "ghcr.io/rocker-org/ml") |> - generate_versioned_tags() - - ## ml-verse - bake_json_content$target$`ml-verse`$labels <- c( - bake_json_content$target$`ml-verse`$labels, - default_labels - ) - bake_json_content$target$`ml-verse`$tags <- c("docker.io/rocker/ml-verse", "ghcr.io/rocker-org/ml-verse") |> - generate_versioned_tags() - - # Update cache-from - bake_json_content$target$`cuda`$`cache-from` <- - bake_json_content$target$ml$`cache-from` <- - bake_json_content$target$`ml-verse`$`cache-from` <- - c( - bake_json_content$target$`cuda`$tags, - bake_json_content$target$ml$tags, - bake_json_content$target$`ml-verse`$tags - ) - jsonlite::write_json( bake_json_content, path = glue::glue_data( @@ -297,7 +263,7 @@ df_args |> ) -# binder and cuda bake files +# binder bake files df_args |> purrr::pwalk( \(...) { diff --git a/build/scripts/generate-dockerfiles.R b/build/scripts/generate-dockerfiles.R index 584c641c..de4e88ee 100644 --- a/build/scripts/generate-dockerfiles.R +++ b/build/scripts/generate-dockerfiles.R @@ -61,9 +61,6 @@ tibble::tibble( "geospatial", "shiny", "shiny-verse", - "cuda", - "ml", - "ml-verse", "binder" ) ) |> diff --git a/build/scripts/generate-matrix.R b/build/scripts/generate-matrix.R index 1b452238..c217ba5c 100644 --- a/build/scripts/generate-matrix.R +++ b/build/scripts/generate-matrix.R @@ -37,7 +37,7 @@ supported_versions |> write_matrix("build/matrix/latest.json") -# binda and cuda +# binder supported_versions |> utils::tail(2) |> write_matrix("build/matrix/latest-two.json") diff --git a/build/templates/bakefiles/extra.docker-bake.json b/build/templates/bakefiles/extra.docker-bake.json index d8315dcf..f9bf783a 100644 --- a/build/templates/bakefiles/extra.docker-bake.json +++ b/build/templates/bakefiles/extra.docker-bake.json @@ -3,18 +3,13 @@ { "default": [ { - "targets": ["cuda", "ml", "ml-verse", "binder"] + "targets": ["binder"] } ], "binder-images": [ { "targets": ["binder"] } - ], - "cuda-images": [ - { - "targets": ["cuda", "ml", "ml-verse"] - } ] } ], @@ -29,39 +24,6 @@ }, "platforms": ["linux/amd64"], "cache-to": ["type=inline"] - }, - "cuda": { - "dockerfile": "dockerfiles/cuda_{{r_version}}.Dockerfile", - "labels": { - "org.opencontainers.image.title": "rocker/cuda", - "org.opencontainers.image.description": "NVIDIA CUDA libraries added to Rocker image.", - "org.opencontainers.image.base.name": "docker.io/nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04", - "org.opencontainers.image.version": "R-{{r_version}}" - }, - "platforms": ["linux/amd64"], - "cache-to": ["type=inline"] - }, - "ml": { - "dockerfile": "dockerfiles/ml_{{r_version}}.Dockerfile", - "labels": { - "org.opencontainers.image.title": "rocker/ml", - "org.opencontainers.image.description": "Docker image with R + GPU support for machine learning libraries.", - "org.opencontainers.image.base.name": "docker.io/nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04", - "org.opencontainers.image.version": "R-{{r_version}}" - }, - "platforms": ["linux/amd64"], - "cache-to": ["type=inline"] - }, - "ml-verse": { - "dockerfile": "dockerfiles/ml-verse_{{r_version}}.Dockerfile", - "labels": { - "org.opencontainers.image.title": "rocker/ml-verse", - "org.opencontainers.image.description": "Docker image with R + GPU support for machine learning libraries, and many R packages.", - "org.opencontainers.image.base.name": "docker.io/nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04", - "org.opencontainers.image.version": "R-{{r_version}}" - }, - "platforms": ["linux/amd64"], - "cache-to": ["type=inline"] } } } diff --git a/build/templates/dockerfiles/cuda.Dockerfile.txt b/build/templates/dockerfiles/cuda.Dockerfile.txt deleted file mode 100644 index c7adc494..00000000 --- a/build/templates/dockerfiles/cuda.Dockerfile.txt +++ /dev/null @@ -1,40 +0,0 @@ -# syntax=docker/dockerfile:1 - -FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04 - -ENV R_VERSION="{{r_version}}" -ENV R_HOME="/usr/local/lib/R" -ENV TZ="Etc/UTC" - -COPY scripts/install_R_source.sh /rocker_scripts/install_R_source.sh -RUN /rocker_scripts/install_R_source.sh - -ENV CRAN="{{cran}}" -ENV LANG=en_US.UTF-8 - -COPY scripts/bin/ /rocker_scripts/bin/ -COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh -RUN <