Skip to content

Commit dc7c741

Browse files
committed
resubmit
1 parent 43a3b10 commit dc7c741

File tree

2 files changed

+12
-23
lines changed

2 files changed

+12
-23
lines changed

CRAN-SUBMISSION

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
Version: 2.1.11
2-
Date: 2025-02-06 20:05:59 UTC
3-
SHA: ec6a4fb07a8c7abe57b6b4e83353f4c6569d8286
2+
Date: 2025-02-06 21:23:37 UTC
3+
SHA: 43a3b10c137ff05d1282f44eeab5d25418a7f841

docker/testing/Dockerfile

+10-21
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM rocker/drd
1+
FROM rocker/r-devel-san
22

33
MAINTAINER Thibaut Jombart <[email protected]>
44

55
RUN apt-get update && apt-get upgrade -y
6-
RUN apt-get install libssl-dev libxml2-dev pandoc pandoc-citeproc libblas-dev liblapack-dev git qpdf -y
6+
RUN apt-get install -y libcurl4-openssl-dev libssl-dev libfontconfig1-dev libxml2-dev libharfbuzz-dev libfribidi-dev libfreetype6-dev libpng-dev libtiff5-dev libjpeg-dev gdal-bin proj-bin libgdal-dev libproj-dev libgmp3-dev jags libfftw3-dev
77

88
## add guest user
99

@@ -15,35 +15,24 @@ RUN chmod a+rw /usr/local/lib/R/site-library -R
1515

1616
## install CRAN packages
1717

18-
RUN echo 'options(download.file.method = "libcurl", repos = c(CRAN = "https://cran.ma.imperial.ac.uk"))' > ~/.Rprofile
18+
# RUN echo 'options(download.file.method = "libcurl", repos = c(CRAN = "https://cran.ma.imperial.ac.uk"))' > ~/.Rprofile
1919

2020
RUN r -e "install.packages('devtools')" \
21-
&& r -e "install.packages('roxygen2')" \
22-
&& r -e "install.packages('testthat')" \
23-
&& r -e "install.packages('rmarkdown')" \
24-
&& r -e "install.packages('adegenet', dependencies = c('Depends', 'Imports'))" \
25-
&& r -e "install.packages('pegas')" \
26-
&& r -e "install.packages('hierfstat')" \
27-
&& r -e "install.packages('poppr')" \
28-
&& r -e "install.packages('akima')" \
29-
&& r -e "install.packages('maps')" \
30-
&& r -e "install.packages('splancs')" \
31-
&& r -e "install.packages('tripack')"
21+
&& r -e "install.packages('adegenet', dependencies = TRUE)"
3222

33-
34-
35-
## install devel packages (github)
36-
37-
RUN r -e "devtools::install_github('thibautjombart/adegenet')"
23+
RUN r -e 'install.packages("BiocManager")' \
24+
&& r -e 'BiocManager::install("SNPRelate")' \
25+
&& r -e 'install.packages("dartR.base")'
3826

3927

4028
## clone repos to get sources
29+
RUN apt-get install -y git
4130

4231
RUN su guest
4332
RUN mkdir ~/dev
4433
WORKDIR /home/guest/dev
4534

46-
RUN git clone https://github.com/thibautjombart/adegenet
35+
COPY . .
4736

4837
WORKDIR /home/guest/
49-
RUN ls='ls --color=auto'
38+
CMD Rscript -e 'library(dartR.base); gl.pcoa(testset.gl)'

0 commit comments

Comments
 (0)