v1.2.3

- refactor: Update DOCKERFILE
tetratech · Jul 21, 2022 · a5d7686 · a5d7686
1 parent b6a0477
commit a5d7686
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 6 deletions.
diff --git 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="[email protected]", role=c("aut","cre")),
   person("Jon","Harcum", role="aut"),

diff --git 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
@@ -4,7 +4,13 @@ NEWS
 
 <!-- NEWS.md is generated from NEWS.Rmd. Please edit that file -->
 
-    #> 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
@@ -4,7 +4,13 @@ NEWS
 
 <!-- NEWS.md is generated from NEWS.Rmd. Please edit that file -->
 
-    #> 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
@@ -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
@@ -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