Commit 23a9f9bf authored by Olivier Benz's avatar Olivier Benz
Browse files

Merge branch 'master' into freeze-version

parents 5af4f0c1 607f283d
FROM registry.gitlab.b-data.ch/rocker/verse:4.0.5
FROM registry.gitlab.b-data.ch/rocker/verse:4.1.0
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
......
......@@ -9,7 +9,7 @@ ARG BUILD_DATE
ARG CRAN
## Setting a BUILD_DATE will set CRAN to the matching MRAN date
## No BUILD_DATE means that CRAN will default to latest
ENV R_VERSION=${R_VERSION:-4.0.5} \
ENV R_VERSION=${R_VERSION:-4.1.0} \
CRAN=${CRAN:-https://cran.rstudio.com} \
LC_ALL=en_US.UTF-8 \
LANG=en_US.UTF-8 \
......
FROM registry.gitlab.b-data.ch/r/r-ver:4.0.5
FROM registry.gitlab.b-data.ch/r/r-ver:4.1.0
ARG RSTUDIO_VERSION
#ENV RSTUDIO_VERSION=${RSTUDIO_VERSION:-1.4.1106}
......@@ -7,7 +7,7 @@ ARG PANDOC_TEMPLATES_VERSION
ENV S6_VERSION=${S6_VERSION:-v1.21.7.0}
ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
ENV PATH=/usr/lib/rstudio-server/bin:$PATH
ENV PANDOC_TEMPLATES_VERSION=${PANDOC_TEMPLATES_VERSION:-2.10.1}
ENV PANDOC_TEMPLATES_VERSION=${PANDOC_TEMPLATES_VERSION:-2.13}
## Download and install RStudio server & dependencies
## Attempts to get detect latest version, otherwise falls back to version given in $VER
......
FROM registry.gitlab.b-data.ch/rocker/rstudio:4.0.5
FROM registry.gitlab.b-data.ch/rocker/rstudio:4.1.0
RUN apt-get update -qq && apt-get -y --no-install-recommends install \
libxml2-dev \
......
FROM registry.gitlab.b-data.ch/rocker/tidyverse:4.0.5
FROM registry.gitlab.b-data.ch/rocker/tidyverse:4.1.0
ARG CTAN_REPO=${CTAN_REPO:-http://mirror.ctan.org/systems/texlive/tlnet}
ENV CTAN_REPO=${CTAN_REPO}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment