Updating the rbaseimage to 4.0.1

kaybenleroll · Sep 13, 2020 · cfb6760 · cfb6760
1 parent 67cfd5b
commit cfb6760
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git a/r_baseimage/Dockerfile b/r_baseimage/Dockerfile
@@ -1,11 +1,12 @@
-FROM rocker/verse:4.0.0
+FROM rocker/verse:4.0.1
 
 RUN apt-get update \
   && apt-get upgrade -y \
   && apt-get install -y --no-install-recommends \
     byobu \
     clang \
     clang-9 \
+    ditaa \
     less \
     libclang-dev \
     libglpk-dev \
@@ -32,15 +33,19 @@ RUN apt-get update \
     bayesplot \
     brms \
     broom \
+    broom.mixed \
+    broomExtra \
     conflicted \
     cowplot \
     DataExplorer \
     directlabels \
+    drake \
     fs \
     furrr \
     googleCloudStorageR \
     loo \
     projpred \
+    prophet \
     rstan \
     rstanarm \
     sessioninfo \

diff --git a/r_baseimage/Makefile b/r_baseimage/Makefile
@@ -1,11 +1,14 @@
 PROJECT_USER=kaybenleroll
 PROJECT_NAME=r_baseimage
-PROJECT_TAG=base202007
+PROJECT_TAG=base202009
 
 CONTAINER_NAME=kaybenleroll_baseimage
 
 DOCKER_USER=rstudio
+DOCKER_UID=$(shell id -u)
+DOCKER_GID=$(shell id -g)
 
+RSTUDIO_PORT=8787
 
 IMAGE_TAG=${PROJECT_USER}/${PROJECT_NAME}:${PROJECT_TAG}
 
@@ -15,10 +18,12 @@ docker-build-image: Dockerfile
 
 docker-run:
 	docker run --rm -d \
-	  -p 8787:8787 \
+	  -p ${RSTUDIO_PORT}:8787 \
 	  -e USER=${DOCKER_USER} \
 	  -e PASSWORD=quickpass \
-		--name ${CONTAINER_NAME} \
+	  -e USERID=${DOCKER_UID} \
+	  -e GROUPID=${DOCKER_GID} \
+	  --name ${CONTAINER_NAME} \
 	  ${IMAGE_TAG}
 
 docker-stop:

diff --git a/r_baseimage/build/conffiles.7z b/r_baseimage/build/conffiles.7z
diff --git a/r_baseimage/build/docker_install_rpkgs.R b/r_baseimage/build/docker_install_rpkgs.R
@@ -11,14 +11,14 @@ remotes::install_github(
 )
 
 remotes::install_github(
-  "jgabry/posterior",
-  ref = "ecd99b1d6806fc02dce425207236e8f7d6f75939",
+  "stan-dev/posterior",
+  ref = "4794130b548511c9861fc0085ba5a677afeba6fe",
   upgrade = "never"
 )
 
 remotes::install_github(
   "stan-dev/cmdstanr",
-  ref = "3422dc45dac7dbd57a799690e38b91a9ebcdf87f",
+  ref = "fc37abd8dd9950181201e08fbaff1549d982a17f",
   upgrade = "never"
 )
 
@@ -32,7 +32,8 @@ cmdstan_flags <- list(
   "CXX14FLAGS" = "-Os -mtune=native -march=native  -Wno-unused-variable -Wno-unused-function  -Wno-unknown-pragmas -Wno-macro-redefined"
 )
 
-install_cmdstan(cores = parallel::detectCores(),
-                flags = cmdstan_flags
-                )
+install_cmdstan(
+  cores       = parallel::detectCores(),
+  cpp_options = cmdstan_flags
+)