Merge remote-tracking branch 'origin/master'

Dockerfile.multi

@@ -24,6 +24,8 @@ RUN apt-get update && apt-get install -y \
     libglib2.0-dev/unstable \
     libmount-dev/unstable \
     libgsl-dev \
+    libudunits2-dev \
+    libgdal-dev \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 
@@ -50,7 +52,7 @@ RUN wget --no-verbose https://download3.rstudio.org/ubuntu-14.04/x86_64/VERSION
 
 ## R package dependencies
 ## Add here R packages dependencies
-RUN Rscript -e "install.packages(c('shiny','readr','dplyr','tidyr', 'leaflet','RColorBrewer', 'shinydashboard', 'DT', 'plotly', 'parallel'), repos='https://cran.biotools.fr/')"
+RUN Rscript -e "install.packages(c('shiny','readr','dplyr','tidyr', 'leaflet','RColorBrewer', 'shinydashboard', 'DT', 'plotly', 'sf'), repos='https://cran.biotools.fr/')"
 ## To get last version of packages
 # comment it if you install specific R packages version
 RUN Rscript -e "update.packages(ask=FALSE)"
@@ -119,7 +121,15 @@ RUN mkdir -p /srv/shiny-server/${APP_NAME}
 COPY global.R /srv/shiny-server/${APP_NAME}
 COPY ui.R /srv/shiny-server/${APP_NAME}
 COPY server.R /srv/shiny-server/${APP_NAME}
-ADD R /srv/shiny-server/${APP_NAME}/R
+RUN mkdir -p /srv/shiny-server/${APP_NAME}/R
+COPY R/rawcurves_plotly_f.R /srv/shiny-server/${APP_NAME}/R/
+COPY R/compare_slope_EU_analysis_f.R /srv/shiny-server/${APP_NAME}/R/
+COPY R/compare_slope_GENERIC_f.R /srv/shiny-server/${APP_NAME}/R/
+COPY R/compare_slope_generic_main_f.R /srv/shiny-server/${APP_NAME}/R/
+COPY R/compare_slope_generic_plotly_f.R /srv/shiny-server/${APP_NAME}/R/
+COPY R/compare_slope_generic_predict_f.R /srv/shiny-server/${APP_NAME}/R/
+COPY R/compare_slope_generic_plotlybis_f.R /srv/shiny-server/${APP_NAME}/R/
+#ADD R /srv/shiny-server/${APP_NAME}/R
 ADD www /srv/shiny-server/${APP_NAME}/www
 
 RUN chown -R shiny.root /srv/shiny-server