From a5d7686fbe2d4fdbd4a255566579031aa9b8cdc4 Mon Sep 17 00:00:00 2001 From: Erik Leppo Date: Thu, 21 Jul 2022 15:50:04 -0400 Subject: [PATCH] v1.2.3 - refactor: Update DOCKERFILE --- DESCRIPTION | 2 +- Dockerfile | 8 ++++++-- NEWS | 8 +++++++- NEWS.md | 8 +++++++- NEWS.rmd | 6 ++++++ inst/shiny-examples/baytrendsmap/global.R | 2 +- 6 files changed, 28 insertions(+), 6 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 6822d52..9fdac60 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: baytrendsmap Title: Shiny App to Create Maps on-the-Fly from Output of the Baytrends Package Description: Shiny app to create maps on-the-fly from output of the baytrends package. -Version: 1.2.2 +Version: 1.2.3 Authors@R: c( person("Erik W.", "Leppo", email="Erik.Leppo@tetratech.com", role=c("aut","cre")), person("Jon","Harcum", role="aut"), diff --git a/Dockerfile b/Dockerfile index b6da5a8..014ff6b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,18 @@ -FROM rocker/geospatial:3.6.2 +FROM rocker/geospatial:4.2.1 RUN apt-get update && apt-get upgrade -y && rm -rf /var/lib/apt/lists/* ENV PASSWORD=IcantB3li3v3itsN)TbutterCanYou -RUN export ADD=shiny && bash /etc/cont-init.d/add && rm -rf /srv/shiny-apps/* +#RUN export ADD=shiny && bash /etc/cont-init.d/add && rm -rf /srv/shiny-apps/* +RUN /rocker_scripts/install_shiny_server.sh + RUN install2.r --error \ baytrends \ shinyBS \ + shinyjs \ + shinyalert \ DT \ ggplot2 \ rgdal \ diff --git a/NEWS b/NEWS index 1e34891..c10a25b 100644 --- a/NEWS +++ b/NEWS @@ -4,7 +4,13 @@ NEWS - #> Last Update: 2022-07-21 08:36:22 + #> Last Update: 2022-07-21 15:42:29 + +# baytrendsmap 1.2.3 + +Released - 2022-07-21 + +- refactor: Update DOCKERFILE # baytrendsmap 1.2.2 diff --git a/NEWS.md b/NEWS.md index 1e34891..c10a25b 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,7 +4,13 @@ NEWS - #> Last Update: 2022-07-21 08:36:22 + #> Last Update: 2022-07-21 15:42:29 + +# baytrendsmap 1.2.3 + +Released - 2022-07-21 + +- refactor: Update DOCKERFILE # baytrendsmap 1.2.2 diff --git a/NEWS.rmd b/NEWS.rmd index c9a78e9..670b337 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -20,6 +20,12 @@ knitr::opts_chunk$set( cat(paste0("Last Update: ",Sys.time())) ``` +baytrendsmap 1.2.3 +=========== +Released - 2022-07-21 + +* refactor: Update DOCKERFILE + baytrendsmap 1.2.2 =========== Released - 2022-07-21 diff --git a/inst/shiny-examples/baytrendsmap/global.R b/inst/shiny-examples/baytrendsmap/global.R index c2f1df7..9666197 100644 --- a/inst/shiny-examples/baytrendsmap/global.R +++ b/inst/shiny-examples/baytrendsmap/global.R @@ -25,7 +25,7 @@ library(shinyalert) # popup modal at start up #pkgver <- packageVersion("baytrendsmap") # does not work on Shinyapps.io #pkgver <- installed.packages()["baytrendsmap", "Version"] # believe ShinyApps.io blocks some system level commands -pkgver <- "1.2.2" +pkgver <- "1.2.3" # File Size ---- # By default, the file size limit is 5MB. It can be changed by