v0.14.1 - Update Docker container

mpascariu · Nov 1, 2023 · cf381d6 · cf381d6
1 parent df8a5e5
commit cf381d6
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 52 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: lemur
 Title: Life expectancy monitor upscaled in R
-Version: 0.14.0
+Version: 0.14.1
 Authors@R: c(
   person("Marius D.", "Pascariu", role = c("aut", "cre", "cph"), email = "rpascariu@outlook.com", comment = c(ORCID = "0000-0002-2568-6489")),
   person("Jose Manuel", "Aburto", role = "aut", comment = c(ORCID = "0000-0002-2926-6879")),
@@ -18,32 +18,32 @@ Description: The life expectancy monitoring tool allows the user to selected
   time, countries and sexes.
 License: GPL (>= 3) + file LICENSE
 Imports: 
-  data.table,
-  DT,
-  glue,
-  ggplot2,
-  htmltools,
-  leaflet,
-  leaflet.extras,
-  purrr,
-  sf,
-  MortalityLaws,
-  dplyr,
-  tidyr,
-  tibble,
-  shiny,
-  shinydashboard,
-  shinyBS,
-  shinyWidgets,
-  shinyjs,
-  plotly,
-  golem,
-  DBI,
-  RPostgres
+  data.table (>= 1.14.8),
+  DT (>= 0.3),
+  glue (>= 1.6.2),
+  ggplot2 (>= 3.4.2),
+  htmltools (>= 0.5.5),
+  leaflet (>= 2.2.0),
+  leaflet.extras (>= 1.0.0),
+  purrr (>= 1.0.1),
+  sf (>= 1.0-14),
+  MortalityLaws (>= 2.0.3),
+  dplyr (>= 1.1.2),
+  tidyr (>= 1.3.0),
+  tibble (>= 3.2.1),
+  shiny (>= 1.7.4.1),
+  shinydashboard (>= 0.7.2),
+  shinyBS (>= 0.61.1),
+  shinyWidgets (>= 0.8.0),
+  shinyjs (>= 2.1.0),
+  plotly (>= 4.10.2),
+  golem (>= 0.4.1),
+  DBI (>= 1.1.3),
+  RPostgres (>= 1.4.5)
 Encoding: UTF-8
 LazyData: true
 RoxygenNote: 7.2.3
 Suggests: 
   testthat (>= 3.0.0)
 Depends: 
-  R (>= 2.10)
+  R (>= 4.3.0)
diff --git a/Dockerfile b/Dockerfile
@@ -1,34 +1,35 @@
-FROM rocker/r-ver:3.6.3
-RUN apt-get update && apt-get install -y  gdal-bin git-core libcurl4-openssl-dev libgdal-dev libgeos-dev libgeos++-dev libgit2-dev libicu-dev libpng-dev libpq-dev libproj-dev libssl-dev libudunits2-dev libxml2-dev make pandoc pandoc-citeproc zlib1g-dev && rm -rf /var/lib/apt/lists/*
-RUN echo "options(repos = c(CRAN = 'https://cran.rstudio.com/'), download.file.method = 'libcurl', Ncpus = 4)" >> /usr/local/lib/R/etc/Rprofile.site
+FROM rocker/verse:4.3.0
+RUN apt-get update && apt-get install -y  gdal-bin libcurl4-openssl-dev libgdal-dev libgeos-dev libgeos++-dev libicu-dev libpng-dev libpq-dev libproj-dev libssl-dev libudunits2-dev libxml2-dev make pandoc zlib1g-dev && rm -rf /var/lib/apt/lists/*
+RUN mkdir -p /usr/local/lib/R/etc/ /usr/lib/R/etc/
+RUN echo "options(repos = c(CRAN = 'https://cran.rstudio.com/'), download.file.method = 'libcurl', Ncpus = 4)" | tee /usr/local/lib/R/etc/Rprofile.site | tee /usr/lib/R/etc/Rprofile.site
 RUN R -e 'install.packages("remotes")'
-RUN Rscript -e 'remotes::install_version("tibble",upgrade="never", version = "3.1.6")'
-RUN Rscript -e 'remotes::install_version("glue",upgrade="never", version = "1.5.1")'
-RUN Rscript -e 'remotes::install_version("purrr",upgrade="never", version = "0.3.4")'
-RUN Rscript -e 'remotes::install_version("htmltools",upgrade="never", version = "0.5.2")'
-RUN Rscript -e 'remotes::install_version("dplyr",upgrade="never", version = "1.0.7")'
-RUN Rscript -e 'remotes::install_version("ggplot2",upgrade="never", version = "3.3.5")'
-RUN Rscript -e 'remotes::install_version("DBI",upgrade="never", version = "1.1.1")'
-RUN Rscript -e 'remotes::install_version("shiny",upgrade="never", version = "1.7.1")'
-RUN Rscript -e 'remotes::install_version("data.table",upgrade="never", version = "1.14.2")'
-RUN Rscript -e 'remotes::install_version("tidyr",upgrade="never", version = "1.1.4")'
-RUN Rscript -e 'remotes::install_version("leaflet",upgrade="never", version = "2.0.4.1")'
-RUN Rscript -e 'remotes::install_version("testthat",upgrade="never", version = "3.1.1")'
-RUN Rscript -e 'remotes::install_version("RPostgres",upgrade="never", version = "1.4.1")'
-RUN Rscript -e 'remotes::install_version("golem",upgrade="never", version = "0.3.1")'
-RUN Rscript -e 'remotes::install_version("plotly",upgrade="never", version = "4.10.0")'
-RUN Rscript -e 'remotes::install_version("shinyjs",upgrade="never", version = "2.0.0")'
-RUN Rscript -e 'remotes::install_version("shinyWidgets",upgrade="never", version = "0.6.2")'
-RUN Rscript -e 'remotes::install_version("shinyBS",upgrade="never", version = "0.61")'
+RUN Rscript -e 'remotes::install_version("tibble",upgrade="never", version = "3.2.1")'
+RUN Rscript -e 'remotes::install_version("glue",upgrade="never", version = "1.6.2")'
+RUN Rscript -e 'remotes::install_version("htmltools",upgrade="never", version = "0.5.5")'
+RUN Rscript -e 'remotes::install_version("purrr",upgrade="never", version = "1.0.1")'
+RUN Rscript -e 'remotes::install_version("dplyr",upgrade="never", version = "1.1.2")'
+RUN Rscript -e 'remotes::install_version("ggplot2",upgrade="never", version = "3.4.2")'
+RUN Rscript -e 'remotes::install_version("DBI",upgrade="never", version = "1.1.3")'
+RUN Rscript -e 'remotes::install_version("shiny",upgrade="never", version = "1.7.4.1")'
+RUN Rscript -e 'remotes::install_version("data.table",upgrade="never", version = "1.14.8")'
+RUN Rscript -e 'remotes::install_version("tidyr",upgrade="never", version = "1.3.0")'
+RUN Rscript -e 'remotes::install_version("leaflet",upgrade="never", version = "2.2.0")'
+RUN Rscript -e 'remotes::install_version("testthat",upgrade="never", version = "3.1.10")'
+RUN Rscript -e 'remotes::install_version("RPostgres",upgrade="never", version = "1.4.5")'
+RUN Rscript -e 'remotes::install_version("golem",upgrade="never", version = "0.4.1")'
+RUN Rscript -e 'remotes::install_version("plotly",upgrade="never", version = "4.10.2")'
+RUN Rscript -e 'remotes::install_version("shinyjs",upgrade="never", version = "2.1.0")'
+RUN Rscript -e 'remotes::install_version("shinyWidgets",upgrade="never", version = "0.8.0")'
+RUN Rscript -e 'remotes::install_version("shinyBS",upgrade="never", version = "0.61.1")'
 RUN Rscript -e 'remotes::install_version("shinydashboard",upgrade="never", version = "0.7.2")'
-RUN Rscript -e 'remotes::install_version("MortalityLaws",upgrade="never", version = "1.8.5")'
-RUN Rscript -e 'remotes::install_version("sf",upgrade="never", version = "1.0-4")'
+RUN Rscript -e 'remotes::install_version("MortalityLaws",upgrade="never", version = "2.0.3")'
+RUN Rscript -e 'remotes::install_version("sf",upgrade="never", version = "1.0-14")'
 RUN Rscript -e 'remotes::install_version("leaflet.extras",upgrade="never", version = "1.0.0")'
-RUN Rscript -e 'remotes::install_version("DT",upgrade="never", version = "0.20")'
+RUN Rscript -e 'remotes::install_version("DT",upgrade="never", version = "0.30")'
 RUN mkdir /build_zone
 ADD . /build_zone
 WORKDIR /build_zone
 RUN R -e 'remotes::install_local(upgrade="never")'
 RUN rm -rf /build_zone
-# EXPOSE 3838
-# CMD R -e "options('shiny.port'=3838, shiny.host='0.0.0.0');library(lemur);lemur::run_app()"
+EXPOSE 3838
+CMD  ["R", "-e", "options('shiny.port'=3838,shiny.host='0.0.0.0');library(lemur);lemur::run_app()"]
diff --git a/NEWS b/NEWS
@@ -1,3 +1,6 @@
+version 0.14.1
+- Update docker container;
+
 version 0.14.0
 - Fix bug related to lack of maternal mortality data when male population is selected;
 - Fix bug in the under 5 mortality reduction method;

diff --git a/inst/app/www/doc_about.md b/inst/app/www/doc_about.md
@@ -12,12 +12,13 @@ The sustainable development goals (SDG) were set in 2015 with many specific targ
 ---
 #### Updates and news
 
-**Monitor Version:** 0.13.0
+**Monitor Version:** 0.14.1
 
-**Last Update:** "2022-06-02 16:00:16 CEST"
+**Last Update:** "2023-11-01 11:03:21 CET"
 
 **News in previous versions:**
 
+- 2023-11-01 - v0.14.1 - Fix bug related under five and maternal mortality data; 
 - 2022-06-02 - v0.13.0 - Include the maternal and neonatal mortality in the SDG section;
 - 2022-04-26 - v0.12.2 - Develop server side scaling solution, Postgres SQL etc;
 - 2022-03-17 - v0.11.0 - Add new functionality (bookmarks, reset) and provide a more consistet arrangement of the cod with the ICD classification;