Skip to content

Commit 1812cda

Browse files
committed
update ci Dockerfile to R 4.0.0
1 parent bb6017c commit 1812cda

File tree

2 files changed

+19
-8
lines changed

2 files changed

+19
-8
lines changed

ChangeLog

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* inst/include/Rcpp/sugar/functions/sample.h: Replace R_alloc() with
44
a standard vector allocation to reduce memory consumption in sample
55

6+
* docker/ci/Dockerfile: Update for R 4.0.0 (with a temporary
7+
diversion to rocker/r-base:4.0.0, and all-source installations)
8+
69
2020-04-16 Dirk Eddelbuettel <[email protected]>
710

811
* DESCRIPTION (Version, Date): Roll minor version

docker/ci/Dockerfile

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,27 @@
11
## Emacs, make this -*- mode: sh; -*-
22

3-
FROM r-base:latest
3+
#FROM r-base:latest
4+
FROM rocker/r-base:4.0.0
45

56
LABEL org.label-schema.license="GPL-2.0" \
67
org.label-schema.vcs-url="https://github.com/RcppCore/Rcpp" \
78
maintainer="Dirk Eddelbuettel <[email protected]>"
89

10+
# RUN apt-get update \
11+
# && apt-get install -y --no-install-recommends \
12+
# libcurl4-openssl-dev \
13+
# libssl-dev \
14+
# r-cran-inline \
15+
# r-cran-pkgkitten \
16+
# git \
17+
# && install.r covr rbenchmark tinytest
18+
919
RUN apt-get update \
10-
&& apt-get install -y --no-install-recommends \
11-
libcurl4-openssl-dev \
12-
libssl-dev \
13-
r-cran-inline \
14-
r-cran-pkgkitten \
15-
git \
16-
&& install.r covr rbenchmark tinytest
20+
&& apt-get install -y --no-install-recommends \
21+
libcurl4-openssl-dev \
22+
libssl-dev \
23+
git \
24+
&& install.r covr inline pkgKitten rbenchmark tinytest
1725

1826
ENV _R_CHECK_FORCE_SUGGESTS_ FALSE
1927
ENV _R_CHECK_TESTS_NLINES_ 0

0 commit comments

Comments
 (0)