Merge remote-tracking branch 'refs/remotes/origin/ericfigs-docker' in…

…to ericfigs-docker

eric-figs/.gitignore

@@ -0,0 +1,7 @@
+# Packrat
+packrat/lib*/
+packrat/src
+
+# Ignored folders
+sketches/
+design/

eric-figs/Dockerfile

@@ -1,9 +1,10 @@
-FROM r-base
+FROM r-base:3.4.3
 MAINTAINER Eamon O'Dea <[last name without apostrophe]35@gmail.com>
 
 RUN apt-get update && apt-get install -y -q --no-install-recommends \
 libcurl4-openssl-dev \
 libgdal-dev \
+libnlopt-dev \
 libproj-dev \
 libpng-dev \
 libpoppler-cpp-dev \
@@ -14,7 +15,6 @@ libxml2-dev
 
 RUN install2.r --error packrat
 RUN mkdir /root/work
-COPY ./install /root/work/install
 COPY ./packrat /root/work/packrat
 COPY ./.Rprofile /root/work/
 RUN /usr/bin/Rscript -e "setwd(\"/root/work\"); source(\".Rprofile\"); packrat::restore()"

eric-figs/build-image

@@ -1 +1 @@
-docker build -t eamon/reporting-proc-eric-figs:v20171027 .
+docker build -t eamon/reporting-proc-eric-figs:v20180223 .

eric-figs/packrat/packrat.lock

@@ -1,9 +1,7 @@
 PackratFormat: 1.4
 PackratVersion: 0.4.8.1
 RVersion: 3.4.3
-Repos:
-    MRAN_2017_10_25=http://mran.revolutionanalytics.com/snapshot/2017-10-25/,
-    MRAN_2017_07_18=http://mran.revolutionanalytics.com/snapshot/2017-07-18/
+Repos: CRAN=http://cloud.r-project.org
 
 Package: BH
 Source: CRAN

eric-figs/run-scripts

@@ -13,6 +13,6 @@ chmod 757 ${outdir}
 docker run -v ${indir}:/mnt/input:ro \
        -v ${outdir}:/mnt/output \
        -w ${hdir}/work \
-       eamon/reporting-proc-eric-figs:v20171027 /bin/bash -c "/mnt/input/copy-and-run"
+       eamon/reporting-proc-eric-figs:v20180223 /bin/bash -c "/mnt/input/copy-and-run"
 chown -R --reference $0 ${outdir}
 chmod 755 ${outdir}