Skip to content

Commit

Permalink
Merge branch 'master' into no_renv
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewbaxter439 authored Jul 28, 2021
2 parents df51697 + 6763fd2 commit ca1e912
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 0 deletions.
4 changes: 4 additions & 0 deletions .Rprofile
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
message("Do you want to use `renv::activate`? (Warning: not useable within Docker!) [Y/n]\n")

if (readline() %in% c("", "Y", "y")) {source("renv/activate.R")} else {message("renv not activated, continuing...")}

message('You are in your Teen Preg project')
pts <- function(size) return(size*5/14)
12 changes: 12 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
FROM rocker/tidyverse
LABEL maintainer="Andrew Baxter <a.baxter.1@research.gla.ac.uk>"

ENV RENV_VERSION 0.13.0
RUN apt-get update && apt-get -y --no-install-recommends install libudunits2-dev libgdal-dev
RUN R -e "install.packages('remotes', repos = c(CRAN = 'https://cloud.r-project.org'))"
RUN R -e "remotes::install_github('rstudio/renv@${RENV_VERSION}')"

WORKDIR /project
COPY renv.lock renv.lock
RUN R -e 'renv::restore()'
COPY . /home/rstudio
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<!-- badges: start -->
[![DOI](https://zenodo.org/badge/171463624.svg)](https://zenodo.org/badge/latestdoi/171463624)
[![OSF](https://img.shields.io/static/v1?label=OSF&message=osf.io%2F8u9jp&color=15A5EB&link=https://osf.io/8u9jp/&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAOxAAADsQBlSsOGwAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAALrSURBVDiNjZRbaFRXFIb/fWaS1k5IpJiQeoGmFodesOIkRLBeUNoIQpW2AaFvgaJtRaUPFbwRrZdGQYtP3uJrKfpSVDLBNIH2QW1UmubWUqs+VM3MJMHEZGYyM+d8ffCccTIZnf5PZ6/zr3+v9a+9t1QEwGfAfSAGHCjGLya2CEgzHY0vyrFyki1gO9ABnAXmSloqye8gZcjm1APVwGmX+zXgK1TNjrxKeoBg7+N0+oPOYd6/GuPnoSTAp0B3HnfnjAolfZS3x+LLQ4mK/b3j10dTjhI2Ov7nxMMLdyf/klSbx91QSPB+LiNpo6MDk2fuxTM/ebGhpH3l+7uJ1riN8nCvkOA+SX2SNGWjwwMTiqcJ3hqrOmGMGpGakuNVW6ds3jrY90SJZ6KDknZ7C+P6t1JSSNKttkgi1dI/eWoiTdAYs+tmQ+WJ3FJCbdFtMmoJ+Kw737xdsXn9XL8tqU7SDWNMt9zJAnBteMrZ+MtIf204emh1F/78vrJoxh8Kx/Z+/Ovo77+NpBw33QE2G+CRpOoM0trOYU265wOjTbcbqn4spFcbjnyCzEVJKvMbdayZI7+RJP1rSZrhcFFglXifDpJDVsJvSfpOEn4jtSwpZ8ErvkEjHV44VnnxeXo1T+ZcMMYcmzfLunPovXKVWsb7dcwbynI9Nba742E6fmDw8cl4RouQ2XN7XeXZae22R5tARwI+/b3rndnbGl4rmS1pmaRrxpiuZ13APPd2kMg47OkZIxSOTgisUHtkY6gt2qhmrFA4Or73j3GSGW8W9LjXVJJ7bFzBVklN3jppow+7RgfiGecHGX3rhlvKSqz17ateffclXzZVks4ZYz6Xph/smlzGyz6jL4OBLRjqvJhltOyrNwNf5IlJ0hszjH7O42BdepAIr+iIsfxqjCsPkoNAKdCbx91eSNB7vjqBVtfTMsBJ2TBlZz2rB+YD54EutxBrhmAhAD5gJKeSDPD6/0p+geg64B8gAmwpxv8Pzpwmb9gDIfgAAAAASUVORK5CYII=)](https://osf.io/8u9jp/)
[![Docker](https://img.shields.io/docker/cloud/build/andybaxter/teen-preg-project?logo=docker)](https://hub.docker.com/r/andybaxter/teen-preg-project)
[![License](https://img.shields.io/github/license/andrewbaxter439/teen-preg-project)](https://github.com/andrewbaxter439/teen-preg-project/blob/master/LICENSE)
<!-- badges: end -->

Expand Down

0 comments on commit ca1e912

Please sign in to comment.