Updates for 4.6.0

Author: jeroen

fedora/Dockerfile

@@ -8,10 +8,10 @@ RUN \
 # Remove this when fixed: https://github.com/r-lib/pak/issues/787
 RUN \
   yum install -y https://github.com/r-lib/rig/releases/download/latest/r-rig-latest-1.$(arch).rpm && \
-  rig add 4.5.2 --without-pak
+  rig add 4.6.0 --without-pak
 
-ENV PATH="/opt/R/4.5.2/bin:${PATH}"
+ENV PATH="/opt/R/4.6.0/bin:${PATH}"
 
 COPY Renviron /usr/lib64/R/etc/Renviron.site
-COPY Renviron /opt/R/4.5.2/lib/R/etc/Renviron.site
+COPY Renviron /opt/R/4.6.0/lib/R/etc/Renviron.site
 

rocky-9/Dockerfile

@@ -10,8 +10,8 @@ RUN \
 # Remove this when fixed: https://github.com/r-lib/pak/issues/787
 RUN \
   yum install -y https://github.com/r-lib/rig/releases/download/latest/r-rig-latest-1.$(arch).rpm && \
-  rig add 4.5.2 --without-pak
+  rig add 4.6.0 --without-pak
 
-ENV PATH="/opt/R/4.5.2/bin:${PATH}"
+ENV PATH="/opt/R/4.6.0/bin:${PATH}"
 
 COPY Renviron /usr/lib64/R/etc/Renviron.site

ubuntu-22.04/Dockerfile

@@ -12,6 +12,8 @@ RUN echo "deb [trusted=yes] https://cloud.r-project.org/bin/linux/ubuntu $(lsb_r
     apt -yq install language-pack-en-base cloc curl parallel vim wget r-base-dev &&\
     apt clean
 
+RUN R -e "stopifnot(getRversion() >= '4.6')"
+
 ENV LC_ALL=en_US.UTF-8
 ENV LANG=en_US.UTF-8
 

ubuntu-24.04/Dockerfile

@@ -6,12 +6,14 @@ RUN apt -yq update &&\
     apt -yq dist-upgrade &&\
     apt -yq install lsb-release apt-transport-https ca-certificates
 
-RUN echo "deb [trusted=yes] https://ppa.launchpadcontent.net/cran/r-4.6/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/cran.list && \
+RUN echo "deb [trusted=yes] https://cloud.r-project.org/bin/linux/ubuntu $(lsb_release -sc)-cran40/" > /etc/apt/sources.list.d/cran.list && \
     apt -yq update &&\
     apt -yq dist-upgrade &&\
     apt -yq install language-pack-en-base cloc curl parallel vim wget r-base-dev &&\
     apt clean
 
+RUN R -e "stopifnot(getRversion() >= '4.6')"
+
 ENV LC_ALL=en_US.UTF-8
 ENV LANG=en_US.UTF-8
 

ubuntu-26.04/Dockerfile

@@ -6,12 +6,14 @@ RUN apt -yq update &&\
     apt -yq dist-upgrade &&\
     apt -yq install lsb-release apt-transport-https ca-certificates
 
-RUN echo "deb [trusted=yes] https://ppa.launchpadcontent.net/cran/r-4.6/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/cran.list && \
+RUN echo "deb [trusted=yes] https://cloud.r-project.org/bin/linux/ubuntu $(lsb_release -sc)-cran40/" > /etc/apt/sources.list.d/cran.list && \
     apt -yq update &&\
     apt -yq dist-upgrade &&\
     apt -yq install language-pack-en-base cloc curl parallel vim wget r-base-dev &&\
     apt clean
 
+RUN R -e "stopifnot(getRversion() >= '4.6')"
+
 ENV LC_ALL=en_US.UTF-8
 ENV LANG=en_US.UTF-8