diff --git a/README.md b/README.md index 9f72bb4b..bb9548da 100644 --- a/README.md +++ b/README.md @@ -61,21 +61,17 @@ Check [the Wiki](https://github.com/rocker-org/rocker-versioned2/wiki) for the l #### Spacial tags for daily builds -There are also special tags that are not listed in the wiki, `devel` and `latest-daily`. +There are also special tags that are not listed in the wiki, `devel`. The GitHub Actions workflow build and push these images daily. - The `devel` images are based on `ubuntu:latest` (the latest Ubuntu LTS version) and install [the latest R-devel daily snapshot](https://cloud.r-project.org/src/base-prerelease/). - `devel` tag is vailable for `rocker/r-ver`, `rocker/rstudio`, `rocker/tidyverse`, `rocker/verse`. -- The `latest-daily` tag images are based on `rocker/r-ver:latest` and install [the latest RStudio daily build](https://dailies.rstudio.com/). - `latest-daily` tag is available for `rocker/rstudio`, `rocker/tidyverse`, `rocker/verse`. + pre-built `devel` images are available for `rocker/r-ver`, `rocker/rstudio`, `rocker/tidyverse`, `rocker/verse`. #### Spacial tags for geospatial toolkit -`rocker/geospatial:ubuntugis` (`rocker/geospatial:X.Y.Z-ubuntugis`) and `rocker/geospatial:dev-osgeo` are special images -that differ slightly from the regular `rocker/geospatial`. +`rocker/geospatial:dev-osgeo` is special image that differ slightly from the regular `rocker/geospatial`. -- `ubuntugis` is built on packages installed from [the ubuntugis-unstable PPA](https://launchpad.net/~ubuntugis/+archive/ubuntu/ubuntugis-unstable). -- `dev-osgeo` is built on the latest release of [PROJ](https://proj.org/), [GDAL](https://gdal.org/), and [GEOS](https://libgeos.org/). +- built on the latest release of [PROJ](https://proj.org/), [GDAL](https://gdal.org/), and [GEOS](https://libgeos.org/). ## Modifying and extending images @@ -134,8 +130,7 @@ which is used for R <= 3.6.3 images._ Dockerfiles and docker-bake.json files, which define the pre-built images, are in [the `dockerfiles` folder](./dockerfiles/) and [the `bakefiles` folder](./bakefiles/). And, -these files are created from the JSON files under [the `stacks` folder](./stacks/) -by the build scripts under [the `build` folder](./build/). +these files are generated by the build scripts under [the `build` folder](./build/). When a new version of R or RStudio is released, GitHub Actions will automatically create a Pull Request to update these files. diff --git a/build/README.md b/build/README.md index befc1e00..0d217f97 100644 --- a/build/README.md +++ b/build/README.md @@ -29,9 +29,9 @@ The wiki HOME(`Home.md`) is generated from `build/reports/wiki_home.Rmd`. ### Stop building a specific R version -Variables described in the stack files that exist in each version may be referenced during document generation. - -So, if you no longer need to build a particular R version, please edit the `make-matrix.R` script and exclude that R version from the build matrix, instead of remove the stack file for that version. +If you no longer need to build a particular R version, please edit the `build/scripts/generate-matrix.R` script +and exclude that R version from the build matrix. +Matrix files are reffered to in many places. ### Stop building a specific image of a specific R version