Skip to content

Commit e77e79c

Browse files
committed
minor Dockerfile simplification thanks to fewer Suggests:
1 parent 3d26d32 commit e77e79c

File tree

3 files changed

+16
-10
lines changed

3 files changed

+16
-10
lines changed

ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2019-12-03 Dirk Eddelbuettel <[email protected]>
2+
3+
* docker/ci/Dockerfile: Lighter builds as fewer Suggests:
4+
* docker/plus/Dockerfile: Take packages moved from ci/Dockerfile
5+
16
2019-12-01 Dirk Eddelbuettel <[email protected]>
27

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

docker/ci/Dockerfile

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,13 @@ LABEL org.label-schema.license="GPL-2.0" \
88

99
RUN apt-get update \
1010
&& apt-get install -y --no-install-recommends \
11-
r-cran-runit \
1211
r-cran-inline \
13-
r-cran-rmarkdown \
14-
r-cran-knitr \
1512
r-cran-pkgkitten \
16-
r-cran-curl \
17-
r-cran-openssl \
18-
r-cran-httr \
19-
r-cran-lazyeval \
20-
r-cran-withr \
2113
git \
22-
&& install.r rbenchmark pinp covr tinytest
14+
&& install.r covr rbenchmark tinytest
2315

2416
ENV _R_CHECK_FORCE_SUGGESTS_ FALSE
17+
ENV _R_CHECK_TESTS_NLINES_ 0
2518
ENV RunAllRcppTests yes
2619

2720
CMD ["bash"]

docker/plus/Dockerfile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,17 @@ LABEL org.label-schema.license="GPL-2.0" \
88

99
RUN apt-get update \
1010
&& apt-get install -y --no-install-recommends \
11+
r-cran-curl \
12+
r-cran-httr \
13+
r-cran-knitr \
14+
r-cran-lazyeval \
15+
r-cran-openssl \
1116
r-cran-rcpparmadillo \
1217
r-cran-rcppeigen \
1318
r-cran-rcppgsl \
14-
&& install.r microbenchmark BH
19+
r-cran-rmarkdown \
20+
r-cran-runit \
21+
r-cran-withr \
22+
&& install.r BH microbenchmark pinp
1523

1624
CMD ["bash"]

0 commit comments

Comments
 (0)