small updates to two Dockerfiles

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,8 @@
+2020-06-27  Dirk Eddelbuettel  <[email protected]>
+
+	* docker/ci/Dockerfile: Revert back to standard r-base container
+	* docker/plus/Dockerfile: Also install bit64
+
 2020-06-19  Dirk Eddelbuettel  <[email protected]>
 
 	* .travis.yml: Determine package name and version from DESCRIPTION,

docker/ci/Dockerfile

@@ -1,27 +1,27 @@
 ## Emacs, make this -*- mode: sh; -*-
 
-#FROM r-base:latest
-FROM rocker/r-base:4.0.0
+FROM r-base:latest
+#FROM rocker/r-base:4.0.0
 
 LABEL org.label-schema.license="GPL-2.0" \
       org.label-schema.vcs-url="https://github.com/RcppCore/Rcpp" \
       maintainer="Dirk Eddelbuettel <[email protected]>"
 
-# RUN apt-get update \
-#         && apt-get install -y --no-install-recommends \
-#                 libcurl4-openssl-dev \
-#                 libssl-dev \
-#                 r-cran-inline \
-#                 r-cran-pkgkitten \
-#                 git \
-#         && install.r covr rbenchmark tinytest
-
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-               libcurl4-openssl-dev \
-               libssl-dev \
-               git \
-    && install.r covr inline pkgKitten rbenchmark tinytest
+        && apt-get install -y --no-install-recommends \
+                libcurl4-openssl-dev \
+                libssl-dev \
+                r-cran-inline \
+                r-cran-pkgkitten \
+                git \
+        && install.r covr rbenchmark tinytest
+
+#RUN apt-get update \
+#    && apt-get install -y --no-install-recommends \
+#               libcurl4-openssl-dev \
+#               libssl-dev \
+#               git \
+#    && install.r covr inline pkgKitten rbenchmark tinytest
 
 ENV _R_CHECK_FORCE_SUGGESTS_ FALSE
 ENV _R_CHECK_TESTS_NLINES_ 0

docker/plus/Dockerfile

@@ -8,6 +8,7 @@ LABEL org.label-schema.license="GPL-2.0" \
 
 RUN apt-get update \
         && apt-get install -y --no-install-recommends \
+                r-cran-bit64 \
                 r-cran-curl \
                 r-cran-httr \
                 r-cran-knitr \