From cfb6760838e5e64b4820f5be097b73542dbbfcf3 Mon Sep 17 00:00:00 2001 From: Mick Cooney Date: Sun, 13 Sep 2020 13:49:01 +0100 Subject: [PATCH] Updating the rbaseimage to 4.0.1 --- r_baseimage/Dockerfile | 7 ++++++- r_baseimage/Makefile | 11 ++++++++--- r_baseimage/build/conffiles.7z | Bin 4993 -> 4917 bytes r_baseimage/build/docker_install_rpkgs.R | 13 +++++++------ 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/r_baseimage/Dockerfile b/r_baseimage/Dockerfile index e68afaa..ea82e69 100644 --- a/r_baseimage/Dockerfile +++ b/r_baseimage/Dockerfile @@ -1,4 +1,4 @@ -FROM rocker/verse:4.0.0 +FROM rocker/verse:4.0.1 RUN apt-get update \ && apt-get upgrade -y \ @@ -6,6 +6,7 @@ RUN apt-get update \ 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 index fc944ec..c11f0da 100644 --- 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 index 7b8e1f950339f740113f14e0fe127f2245c03832..69058b2255e8dcba35ff0ec57dc17ced9ee62972 100644 GIT binary patch delta 4035 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 p000*Tk$E5C8xSf_@4C9PDw+006Q$$Y=ln delta 4111 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 Nf_@4CDpt+x004lT@0$Ps diff --git a/r_baseimage/build/docker_install_rpkgs.R b/r_baseimage/build/docker_install_rpkgs.R index d1d280b..6469a44 100644 --- 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 +)