Merge remote-tracking branch 'upstream/master'

r-apt/.gitignore

@@ -0,0 +1 @@
+localDockerfile

r-base/.gitignore

@@ -0,0 +1 @@
+local

r-bspm/.gitignore

@@ -0,0 +1 @@
+r-cran-bspm*

r-bspm/focal/Dockerfile

@@ -0,0 +1,22 @@
+## Emacs, make this -*- mode: sh; -*-
+
+FROM rocker/r-ubuntu:20.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 \
+                sudo \
+                r-cran-bspm \
+        && 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-bspm/testing/Dockerfile

@@ -0,0 +1,26 @@
+## Emacs, make this -*- mode: sh; -*-
+
+FROM r-base:latest
+
+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>"
+
+## We use the PPA to install r-cran-bspm; we do not need it afterwards
+COPY eddelbuettel-ppa.list /etc/apt/sources.list.d
+
+## This was not needed before but we need it now
+#ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get update \
+	&& apt-get install -y --no-install-recommends \
+                sudo \
+                r-cran-bspm \
+        && 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 \
+        && rm /etc/apt/sources.list.d/eddelbuettel-ppa.list
+
+CMD ["bash"]

r-bspm/testing/eddelbuettel-ppa.list

@@ -0,0 +1 @@
+deb [trusted=yes] https://eddelbuettel.github.io/ppa ./