Commit 76bf612d authored by Olivier Benz's avatar Olivier Benz
Browse files

Update R to version 4.1.1

parent 438ad17e
......@@ -5,7 +5,7 @@ services:
variables:
DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: "/certs"
R_VERSION_UPDATE: "false"
R_VERSION_UPDATE: "true"
before_script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
......
FROM registry.gitlab.b-data.ch/rocker/verse:4.1.0
FROM registry.gitlab.b-data.ch/rocker/verse:4.1.1
ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
......
......@@ -36,7 +36,7 @@
DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: "/certs"
CRAN: https://cloud.r-project.org
R_VERSION_UPDATE: "false"
R_VERSION_UPDATE: "true"
before_script:
- *before-script-build
......
......@@ -4,12 +4,14 @@ LABEL org.label-schema.license="GPL-2.0" \
org.label-schema.vcs-url="https://gitlab.b-data.ch/r/docker-stack" \
maintainer="Olivier Benz <olivier.benz@b-data.ch>"
ARG DEBIAN_FRONTEND=noninteractive
ARG R_VERSION
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.1.0} \
ENV R_VERSION=${R_VERSION:-4.1.1} \
CRAN=${CRAN:-https://cran.rstudio.com} \
LC_ALL=en_US.UTF-8 \
LANG=en_US.UTF-8 \
......
......@@ -5,7 +5,7 @@ services:
variables:
DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: "/certs"
R_VERSION_UPDATE: "false"
R_VERSION_UPDATE: "true"
before_script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
......
FROM registry.gitlab.b-data.ch/r/r-ver:4.1.0
FROM registry.gitlab.b-data.ch/r/r-ver:4.1.1
ARG DEBIAN_FRONTEND=noninteractive
ARG RSTUDIO_VERSION
#ENV RSTUDIO_VERSION=${RSTUDIO_VERSION:-1.4.1106}
#ENV RSTUDIO_VERSION=${RSTUDIO_VERSION:-1.4.1717}
ARG S6_VERSION
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.13}
ENV PANDOC_TEMPLATES_VERSION=${PANDOC_TEMPLATES_VERSION:-2.14.1}
## Download and install RStudio server & dependencies
## Attempts to get detect latest version, otherwise falls back to version given in $VER
......
......@@ -5,7 +5,7 @@ services:
variables:
DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: "/certs"
R_VERSION_UPDATE: "false"
R_VERSION_UPDATE: "true"
before_script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
......
FROM registry.gitlab.b-data.ch/rocker/rstudio:4.1.0
FROM registry.gitlab.b-data.ch/rocker/rstudio:4.1.1
ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update -qq && apt-get -y --no-install-recommends install \
libxml2-dev \
......
......@@ -5,7 +5,7 @@ services:
variables:
DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: "/certs"
R_VERSION_UPDATE: "false"
R_VERSION_UPDATE: "true"
before_script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
......
FROM registry.gitlab.b-data.ch/rocker/tidyverse:4.1.0
FROM registry.gitlab.b-data.ch/rocker/tidyverse:4.1.1
ARG DEBIAN_FRONTEND=noninteractive
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