incorporate @rpkyle's Dockerfile changes

Author: cpsievert

inst/docker/Dockerfile.vtest

@@ -2,22 +2,18 @@
 # $ docker run -e VMODE="ci" -v $(pwd):/home/plotly --privileged -p 3838:3838 cpsievert/plotly-vtest
 # ------------------------------------------------------------------------------
 
-FROM ubuntu:16.04
+FROM ubuntu:xenial
 MAINTAINER Carson Sievert "carson@rstudio.com"
 
 # Don't print "debconf: unable to initialize frontend: Dialog" messages
 ARG DEBIAN_FRONTED=noninteractive
 ARG CACHEBUST=1
 
 # Need this to add R repo
-RUN apt-get update && apt-get install -y software-properties-common
-
-# Add R apt repository
-RUN add-apt-repository "deb http://cran.r-project.org/bin/linux/ubuntu $(lsb_release -cs)-cran35/"
-RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0x51716619e084dab9
-
-# Install basic stuff and R
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && apt-get install -y software-properties-common apt-transport-https \
+ && add-apt-repository "deb https://cloud.r-project.org/bin/linux/ubuntu xenial-cran35/" \
+ && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E298A3A825C0D65DFD57CBB651716619E084DAB9 \
+ && apt-get update && apt-get install -y \
     sudo \
     git \
     vim-tiny \
@@ -33,11 +29,12 @@ RUN apt-get update && apt-get install -y \
     libcairo2-dev \
     libxt-dev \
     libssl-dev \
-    libxml2-dev 
+    libxml2-dev \
+ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+ && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
+ && locale-gen en_US.utf8 \
+ && /usr/sbin/update-locale LANG=en_US.UTF-8
 
-RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
-   && locale-gen en_US.utf8 \
-   && /usr/sbin/update-locale LANG=en_US.UTF-8
 ENV LANG=en_US.UTF-8
 
 # Rprofile
@@ -48,30 +45,27 @@ RUN echo 'options(\n\
   shiny.host = "0.0.0.0", shiny.port = 3838\n\
 )' >> /etc/R/Rprofile.site
 
-# Update R packages
-RUN R -e "update.packages(ask = F)"
-
-# Other R packages needed for running visual tests
-RUN R -e "install.packages('devtools')" 
-RUN R -e "install.packages('roxygen2')"
-RUN R -e "install.packages('testthat')"
-RUN R -e "install.packages('vdiffr')"
-RUN R -e "install.packages('diffobj')"
+# Update R packages and install those needed for visual testing
+RUN R -e "update.packages(ask = F); invisible(lapply(list('devtools', 'roxygen2', 'testthat', 'vdiffr', 'diffobj'), install.packages, dependencies=TRUE, repos='http://cloud.r-project.org/'))"
 
 # sf system dependencies
-RUN add-apt-repository ppa:ubuntugis/ubuntugis-unstable --yes
-RUN apt-get -y update
-RUN apt-get install -y libudunits2-dev libproj-dev libgeos-dev libgdal-dev
+RUN add-apt-repository ppa:ubuntugis/ubuntugis-unstable --yes \
+ && apt-get -y update \
+ && apt-get install -y libudunits2-dev libproj-dev libgeos-dev libgdal-dev
 
 # Install all plotly's dependencies
 RUN R -e "install.packages('plotly', dependencies = T)"
 
 # system dependencies related to running orca
 RUN apt-get install -y \
-    libgtk2.0-0 \ 
+    libgtk2.0-0 \
     libgconf-2-4 \
     xvfb \
-    fuse \
+    xauth \
+    libxtst6 \
+    libxss1 \
+    libnss3 \
+    libasound2 \
     desktop-file-utils
 
 # google chrome
@@ -81,28 +75,29 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key
     apt-get install -y google-chrome-stable
 
 # Download orca binary and make it executable under xvfb
-RUN wget https://github.com/plotly/orca/releases/download/v1.1.1/orca-1.1.1-x86_64.AppImage -P /home
-RUN chmod 777 /home/orca-1.1.1-x86_64.AppImage 
-RUN printf '#!/bin/bash \nxvfb-run --auto-servernum --server-args "-screen 0 640x480x24" /home/orca-1.1.1-x86_64.AppImage "$@"' > /usr/bin/orca
-RUN chmod 777 /usr/bin/orca
+RUN mkdir -p /opt/orca \
+ && cd /opt/orca \
+ && wget https://github.com/plotly/orca/releases/download/v1.3.1/orca-1.3.1.AppImage \
+ && chmod +x orca-1.3.1.AppImage \
+ && ./orca-1.3.1.AppImage --appimage-extract \
+ && rm orca-1.3.1.AppImage \
+ && printf '#!/bin/bash \nargs=("$@") \nif [[ ! " ${args[@]} " =~ "--no-sandbox" ]]; then \n    args+=("--no-sandbox") \nfi \nxvfb-run --auto-servernum --server-args "-screen 0 640x480x24" /opt/orca/squashfs-root/orca "${args[@]}"' > /usr/bin/orca \
+ && chmod +x /usr/bin/orca
 
 # switch on visual testing
 ENV VDIFFR=true
 EXPOSE 3838
 
-RUN R -e "install.packages('assertthat')"
-RUN R -e "install.packages('testthat')"
-ARG CRANCACHE=1
+
 RUN R -e "update.packages(ask=FALSE)"
 RUN R -e "remotes::install_github('r-lib/vdiffr')"
-RUN R -e "install.packages('rnaturalearth')"
 
 # install any new dependencies, then either manage cases (the default) or run tests
 # note the workaround to get docker to run a proper exit status when there are testthat errors
 # https://github.com/r-lib/testthat/issues/515#issuecomment-304169376
+CMD R -e "remotes::install_deps(dep = TRUE)"
 
-CMD cd /home/plotly && R -e "devtools::install_deps(dep = T); \
-  if (!identical(Sys.getenv('VMODE'), 'ci')) vdiffr::manage_cases(); \
+CMD cd /home/plotly; R -e "if (!identical(Sys.getenv('VMODE'), 'ci')) vdiffr::manage_cases(); \
   res <- devtools::test(reporter='summary'); \
   df <- as.data.frame(res); \
   if (sum(df\$failed) > 0 || any(df\$error)) q(status=1)"