Merge branch 'master' of https://github.com/rocker-org/rocker-versioned

.github/issue_template.md

+---
+name: Tracking issue
+about: This repository is the source for R <= 3.6.3 images built before 2020-04; issues for R >= 4.0.0 images built after 2020-04 should be created in https://github.com/rocker-org/rocker-versioned2, not here.
+---
+
+<!-- This repository is the source for R <= 3.6.3 images built before 2020-04; issues for R >= 4.0.0 images built after 2020-04 should be created in https://github.com/rocker-org/rocker-versioned2, not here. -->

README.md

-[![CircleCI](https://circleci.com/gh/rocker-org/rocker-versioned.svg?style=svg)](https://circleci.com/gh/rocker-org/rocker-versioned)
 [![license](https://img.shields.io/badge/license-GPLv2-blue.svg)](https://opensource.org/licenses/GPL-2.0)
-[![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](http://www.repostatus.org/badges/latest/active.svg)](http://www.repostatus.org/#active)
+[![Project Status: Moved to https://github.com/rocker-org/rocker-versioned2 – The project has been moved to a new location, and the version at that location should be considered authoritative.](https://www.repostatus.org/badges/latest/moved.svg)](https://github.com/rocker-org/rocker-versioned2)
 [![DOI](https://zenodo.org/badge/25048007.svg)](https://zenodo.org/badge/latestdoi/25048007)
 
 
 Visit [rocker-project.org](https://rocker-project.org) for more about available Rocker images, configuration, and use. 
 
+# MOVED to [`rocker-versioned2`](https://github.com/rocker-org/rocker-versioned2)
 
-## Version-stable Rocker images
+This repository contains archived build scripts from the 3.x versioned series only.  Visit  [`rocker-versioned2`](https://github.com/rocker-org/rocker-versioned2) for current build scripts for 4.x versioned images.
+
+
+## Version-stable Rocker images for R 3.x
 
 ![rocker](https://avatars0.githubusercontent.com/u/9100160?v=3&s=200)
 
+***For documentation for R >= 4.0.0, for images `r-ver`, `rstudio`, `tidyverse`, `verse`, `geospatial`, `shiny`, and `binder`, please see the [`rocker-versioned2` repository](https://github.com/rocker-org/rocker-versioned2).*** 
+
 
 image            | description                               | size   | metrics | build status 
 ---------------- | ----------------------------------------- | ------ | ------- | --------------
 [r-ver](https://hub.docker.com/r/rocker/r-ver)            |  Version-stable base R & src build tools  | [![](https://images.microbadger.com/badges/image/rocker/r-ver.svg)](https://microbadger.com/images/rocker/r-ver) | [![](https://img.shields.io/docker/pulls/rocker/r-ver.svg)](https://hub.docker.com/r/rocker/r-ver) |  [![](https://img.shields.io/docker/automated/rocker/r-ver.svg)](https://hub.docker.com/r/rocker/r-ver/builds)
-[rstudio](https://hub.docker.com/r/rocker/rstudio)          |  Adds rstudio                             | [![](https://images.microbadger.com/badges/image/rocker/rstudio-stable.svg)](https://microbadger.com/) | [![](https://img.shields.io/docker/pulls/rocker/rstudio.svg)](https://hub.docker.com/r/rocker/rstudio)  |  [![](https://img.shields.io/docker/automated/rocker/rstudio.svg)](https://hub.docker.com/r/rocker/rstudio/builds)
+[rstudio](https://hub.docker.com/r/rocker/rstudio)          |  Adds rstudio                             | [![](https://images.microbadger.com/badges/image/rocker/rstudio-stable.svg)](https://microbadger.com/images/rocker/rstudio) | [![](https://img.shields.io/docker/pulls/rocker/rstudio.svg)](https://hub.docker.com/r/rocker/rstudio)  |  [![](https://img.shields.io/docker/automated/rocker/rstudio.svg)](https://hub.docker.com/r/rocker/rstudio/builds)
 [tidyverse](https://hub.docker.com/r/rocker/tidyverse)        |  Adds tidyverse & devtools                | [![](https://images.microbadger.com/badges/image/rocker/tidyverse.svg)](https://microbadger.com/images/rocker/tidyverse) | [![](https://img.shields.io/docker/pulls/rocker/tidyverse.svg)](https://hub.docker.com/r/rocker/tidyverse) |  [![](https://img.shields.io/docker/automated/rocker/tidyverse.svg)](https://hub.docker.com/r/rocker/tidyverse/builds) 
 [verse](https://hub.docker.com/r/rocker/verse)            |  Adds tex & publishing-related packages   | [![](https://images.microbadger.com/badges/image/rocker/verse.svg)](https://microbadger.com/images/rocker/verse) | [![](https://img.shields.io/docker/pulls/rocker/verse.svg)](https://hub.docker.com/r/rocker/verse) | [![](https://img.shields.io/docker/automated/rocker/verse.svg)](https://hub.docker.com/r/rocker/verse/builds)
 

VERSIONS.md

@@ -52,9 +52,9 @@ docker build --build-arg RSTUDIO_VERSION=1.1.414 -t rocker/rstudio:3.4.2 .
 | 3.5.1    | 2018-12-20 | 1.1.463         | stretch (9)    |
 | 3.5.2    | 2019-03-11 | 1.1.463         | stretch (9)    |
 | 3.5.3    | 2019-04-26 | 1.2.1335        | stretch (9)    |
-| 3.6.0    | 2019-07-05 |           | stretch (9)    |
-| 3.6.1    | 2019-12-12 |           | stretch (9)    |
-| 3.6.2    | 2020-02-29 |           | buster (10)    |
-| 3.6.3    | latest     | latest          | buster (10)    |
-
+| 3.6.0    | 2019-07-05 | 1.2.1335        | stretch (9)    |
+| 3.6.1    | 2019-12-12 | 1.2.5019        | stretch (9)    |
+| 3.6.2    | 2020-02-29 | 1.2.5033        | buster (10)    |
+| 3.6.3    | 2020-04-24 | 1.2.5042        | buster (10)    |
 
+Images starting with 4.0.0 are based on the stable Ubuntu release contemporary with the R version release (i.e. `ubuntu:focal` for 4.0.x and 4.1.x), and pin versions of RStudio, R packages and other software as defined in https://github.com/rocker-org/rocker-versioned2/tree/master/stacks

rstudio/README.md

@@ -52,19 +52,18 @@ Navigate to <http://localhost:8787> and you should be logged into RStudio as
 the `rstudio` user without needing a password.
 
 
-### Add shiny server on start up with `e ADD=shiny`
+### Add shiny server 
 
-    docker run -d -p 3838:3838 -p 8787:8787 -e ADD=shiny -e PASSWORD=yourpasswordhere rocker/rstudio
-
-shiny server is now running on `localhost:3838` and RStudio on `localhost:8787`.  
+If you are building your own Dockerfiles on top of this stack, you should simply include the RUN command:
 
+    RUN /rocker_scripts/install_shiny_server.sh
 
-Note: this triggers shiny install at runtime, which may require a few minutes to execute before services come up.
-If you are building your own Dockerfiles on top of this stack, you should simply include the RUN command:
+This works on any rocker-versioned image with R >= 4.0.0. 
+NOTE: older images tagged with R version 3.x.x will need to do:
 
     RUN export ADD=shiny && bash /etc/cont-init.d/add
 
-Then omit the `-e ADD=shiny` when running your image and shiny should be installed and waiting on port 3838.
+Run your image and shiny should be installed and waiting on port 3838.
 
 **Note**: Please see the `rocker/shiny` and `rocker/shiny-verse` images for
 setting up a shiny server in a separate container from RStudio.