From 709c5391f389bfbd06281532acb1d07607646c14 Mon Sep 17 00:00:00 2001
From: Matt Lehman <10014947+mattle24@users.noreply.github.com>
Date: Mon, 13 Apr 2020 10:57:40 -0400
Subject: [PATCH] [3.3.0] 3.3.0 release (#44)

* dev 3.3.0 release
Co-authored-by: Patrick Miller <pmiller@civisanalytics.com>
---
 CHANGELOG.md |  4 ++++
 Dockerfile   | 20 ++++++++++----------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1fe6700..c3bcf36 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,10 @@ Version number changes (major.minor.micro) in this package denote the following:
 - A minor version will increase if one or more packages contained in the Docker image add new, backwards-compatible features, or if a new package is added to the Docker image.
 - A major version will increase if there are any backwards-incompatible changes in any of the packages contained in this Docker image, or any other backwards-incompabile changes in the execution environment.
 
+## [3.3.0] - 2020-04-13
+
+- rocker/verse -> 3.6.2
+
 ## [3.2.1] - 2020-02-24
 
 - civis-r -> 2.1.2
diff --git a/Dockerfile b/Dockerfile
index 9929104..4c4661f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM rocker/verse:3.6.1
+FROM rocker/verse:3.6.2
 MAINTAINER support@civisanalytics.com
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get update -y --no-install-recommends && \
@@ -6,11 +6,12 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -y --no-install-recommends &&
         curl \
         libudunits2-dev \
         libcairo-dev \
-        libgdal-dev \        
+        libgdal-dev \
         libgeos-dev \
         libglu1-mesa-dev \
+        libsodium-dev \
         libx11-dev \
-        mesa-common-dev \        
+        mesa-common-dev \
         wget && \
     apt-get clean -y && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
@@ -24,16 +25,15 @@ RUN curl -s https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
     rm -f get-pip.py
 
 # set cran to be default backup to set MRAN repo
-#RUN echo "options(repos = c(options('repos'), 'https://cran.rstudio.com/'), download.file.method = 'libcurl')" >> /usr/local/lib/R/etc/Rprofile.site
-
-RUN Rscript -e "devtools::install_github('civisanalytics/civis-r', ref = 'v2.1.2');"
+# RUN echo "options(repos = c(options('repos'), 'https://cran.rstudio.com/'), download.file.method = 'libcurl')" >> /usr/local/lib/R/etc/Rprofile.site
 
 COPY ./requirements.txt /requirements.txt
 RUN Rscript -e 'install.packages(readLines("requirements.txt"))'
 
-RUN Rscript -e "library(civis)"
+RUN Rscript -e 'install.packages("civis")' && \
+  Rscript -e "library(civis)"
 
-ENV VERSION=3.2.1 \
+ENV VERSION=3.3.0 \
     VERSION_MAJOR=3 \
-    VERSION_MINOR=2 \
-    VERSION_MICRO=1
+    VERSION_MINOR=3 \
+    VERSION_MICRO=0