Merge remote-tracking branch 'upstream/master'

r-bspm/README.md

@@ -0,0 +1,9 @@
+## Rocker r-bspm
+
+The `r-bspm` Dockerfiles from the [Rocker Project](https://www.rocker-project.org/)
+provide basic building blocks using Ubuntu and Debian with the
+[bspm](https://cran.r-project.org/package=bspm) package to bridge from the R package
+management to the system package manager.
+
+Documentation is being added at the [Wiki](https://github.com/rocker-org/rocker/wiki). Please file
+issue tickets at [the rocker/ issue tracker](https://github.com/rocker-org/rocker/issues). 

r-bspm/bionic/Dockerfile

@@ -0,0 +1,22 @@
+## Emacs, make this -*- mode: sh; -*-
+
+FROM rocker/r-ubuntu:18.04
+
+LABEL org.label-schema.license="GPL-2.0" \
+      org.label-schema.vcs-url="https://github.com/rocker-org/rocker" \
+      maintainer="Dirk Eddelbuettel <edd@debian.org>"
+
+## This was not needed before but we need it now
+#ENV DEBIAN_FRONTEND noninteractive
+
+RUN add-apt-repository --yes "ppa:edd/r-4.0" \
+	&& apt-get install -y --no-install-recommends \
+                r-cran-bspm \
+                sudo \
+        && echo "bspm::enable()" >> /etc/R/Rprofile.site \
+        && echo "options(bspm.sudo=TRUE)" >> /etc/R/Rprofile.site \
+        && echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf.d/90local-no-recommends \
+        && echo "docker ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/local-docker-user \
+        && chmod 0440 /etc/sudoers.d/local-docker-user
+
+CMD ["bash"]

r-rspm/README.md

@@ -0,0 +1,8 @@
+## Rocker r-rspm
+
+The `r-rspm` Dockerfiles from the [Rocker Project](https://www.rocker-project.org/) provides basic building using Ubuntu (as opposed to Debian in `r-base`) upon which other containers can be built.  They also offer (initial, still somewhat experimental) support for the [RSPM (RStudio Package Manager)](https://rstudio.com/products/package-manager/) binaries for the supported `bionic` (aka 18.04) and `focal` (aka 20.04) releases.  
+
+As an alternative consider the the [`r-ubuntu` containers](https://hub.docker.com/repository/docker/rocker/r-ubuntu) which are also useful due to the large number of packages offered via the PPAs, and their more complete package dependency tracking.  However, RSPM offers more binaries.
+
+Documentation is being added at the [Wiki](https://github.com/rocker-org/rocker/wiki). Please file
+issue tickets at [the rocker/ issue tracker](https://github.com/rocker-org/rocker/issues). 

r-ubuntu/bionic/Dockerfile

@@ -3,7 +3,7 @@
 FROM ubuntu:bionic
 
 LABEL org.label-schema.license="GPL-2.0" \
-      org.label-schema.vcs-url="https://github.com/rocker-org/r-apt" \
+      org.label-schema.vcs-url="https://github.com/rocker-org/r-ubuntu" \
       org.label-schema.vendor="Rocker Project" \
       maintainer="Dirk Eddelbuettel <edd@debian.org>"
 
@@ -18,14 +18,15 @@ RUN useradd docker \
 RUN apt-get update \
 	&& apt-get install -y --no-install-recommends \
 		software-properties-common \
+                dirmngr \
                 ed \
 		less \
 		locales \
 		vim-tiny \
 		wget \
 		ca-certificates \
-        && add-apt-repository --enable-source --yes "ppa:marutter/rrutter3.5" \
-	&& add-apt-repository --enable-source --yes "ppa:marutter/c2d4u3.5" 
+        && add-apt-repository --enable-source --yes "ppa:marutter/rrutter4.0" \
+        && add-apt-repository --enable-source --yes "ppa:c2d4u.team/c2d4u4.0+"
 
 ## Configure default locale, see https://github.com/rocker-org/rocker/issues/19
 RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \

r-ubuntu/focal/Dockerfile

@@ -3,7 +3,7 @@
 FROM ubuntu:focal
 
 LABEL org.label-schema.license="GPL-2.0" \
-      org.label-schema.vcs-url="https://github.com/rocker-org/r-apt" \
+      org.label-schema.vcs-url="https://github.com/rocker-org/r-ubuntu" \
       org.label-schema.vendor="Rocker Project" \
       maintainer="Dirk Eddelbuettel <edd@debian.org>"