From 62f47c4965e35dd2ecba062bf1457d29378e7920 Mon Sep 17 00:00:00 2001
From: Jonathan Callahan <jonathan.s.callahan@gmail.com>
Date: Tue, 28 Jul 2020 17:21:50 +0000
Subject: [PATCH] updated docker/ to use R 3.6.3

---
 docker/Dockerfile | 18 +++++++++---------
 docker/Makefile   |  4 ++--
 docker/README.md  |  6 +++---
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 8dc02a03..131d4900 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,15 +1,15 @@
-FROM mazamascience/spatialutils:0.6.5
+FROM mazamascience/spatialutils:0.6.6
 
 #######################################################################
 # For PWFSLSmoke
-RUN apt-get update \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/ \
-  && rm -rf /tmp/downloaded_packages/ /tmp/*.rds
+#RUN apt-get update \
+#  && apt-get clean \
+#  && rm -rf /var/lib/apt/lists/ \
+#  && rm -rf /tmp/downloaded_packages/ /tmp/*.rds
 
 # Update to latest CRAN version of currently installed R packages
-RUN r -e "update.packages(repos = 'https://cran.rstudio.com', \
-                          ask = FALSE)"
+#RUN r -e "update.packages(repos = 'https://cran.rstudio.com', \
+#                          ask = FALSE)"
 
 # Install extra R packages from CRAN
 RUN install2.r --error -r "https://cran.rstudio.com" \
@@ -17,6 +17,6 @@ RUN install2.r --error -r "https://cran.rstudio.com" \
     PWFSLSmoke
 
 # Install latest updates from GitHub
-RUN installGithub.r \
-    mazamascience/PWFSLSmoke
+#RUN installGithub.r \
+#    mazamascience/PWFSLSmoke
 
diff --git a/docker/Makefile b/docker/Makefile
index d4c492d2..60d8975c 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -3,7 +3,7 @@
 
 # PRODUCTION version -----------------------------------------------------------
 production_build:
-	docker build --no-cache -t mazamascience/pwfslsmoke:1.2.112 -t mazamascience/pwfslsmoke:latest .
+	docker build --no-cache -t mazamascience/pwfslsmoke:1.2.113 -t mazamascience/pwfslsmoke:latest .
 
 production_publish:
-	docker login && docker push mazamascience/pwfslsmoke:1.2.112
+	docker login && docker push mazamascience/pwfslsmoke:1.2.113
diff --git a/docker/README.md b/docker/README.md
index 55f006c7..7aa5c546 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -13,7 +13,7 @@ You should then be able to see something like the following:
 ```
 $ docker images
 REPOSITORY                          TAG                     IMAGE ID            CREATED             SIZE
-mazamascience/pwfslsmoke            1.2.112                 1824e396e3f3        34 seconds ago      2.61GB
+mazamascience/pwfslsmoke            1.2.113                 1824e396e3f3        34 seconds ago      2.61GB
 mazamascience/pwfslsmoke            latest                  1824e396e3f3        34 seconds ago      2.61GB
 ...
 ```
@@ -31,7 +31,7 @@ obtained on July 08, 2020 -- Fourth of July Fireworks!!!:
 
 
 ```
-docker run -ti mazamascience/pwfslsmoke R --vanilla
+docker run -ti --rm mazamascience/pwfslsmoke R --vanilla
 ...
 library(PWFSLSmoke)
 wa <- airnow_loadLatest() %>%
@@ -62,6 +62,6 @@ make production_publish
 This image can also be pulled from DockerHub with:
 
 ```
-docker pull mazamascience/pwfslsmoke:1.2.112
+docker pull mazamascience/pwfslsmoke:1.2.113
 ```