Merge branch 'rocker-org:master' into devel

Author: almahmoud

.github/workflows/docker.yaml

@@ -1,5 +1,5 @@
 ## Dual build:
-##  - once in (focal,jammy) matrix for amd64 only, and
+##  - once in (focal [now skipped],jammy) matrix for amd64 only, and
 ##  - once (noble) for a dual-platform (arm64, amd64)
 
 name: docker
@@ -9,6 +9,8 @@ on:
   #pull_request:
   #release:
   workflow_dispatch:
+  schedule:
+  - cron: "33 3 3 * *"
 
 jobs:
   dual-platform:
@@ -34,15 +36,43 @@ jobs:
         platforms: linux/amd64,linux/arm64
         context: noble
         tags: rocker/r2u:noble,rocker/r2u:24.04,rocker/r2u:latest
-    
+
+        
+  dual-platform_ci:
+    needs: dual-platform
+    runs-on: ubuntu-latest
+    name: 24.04 ci (amd64, arm64)
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+    - name: Login to DockerHub
+      uses: docker/login-action@v3
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+    - name: Build and push
+      uses: docker/build-push-action@v6
+      with:
+        push: true
+        no-cache: true
+        platforms: linux/amd64,linux/arm64
+        context: noble_ci
+        tags: rocker/r2u4ci:noble,rocker/r2u4ci:24.04,rocker/r2u4ci:latest
+
+        
   matrix:
     runs-on: ${{ matrix.config.runs }}
     name: '${{ matrix.config.ver }} (${{ matrix.config.cpu }})'
     strategy:
       fail-fast: false
       matrix:
         config:
-          - { ver: '20.04', tag: 'focal', cpu: 'amd64', runs: 'ubuntu-20.04' }
+          # no really a matrix with just one line...
+          #- { ver: '20.04', tag: 'focal', cpu: 'amd64', runs: 'ubuntu-20.04' }
           - { ver: '22.04', tag: 'jammy', cpu: 'amd64', runs: 'ubuntu-22.04' }
     steps:
     - name: Checkout

README.md

@@ -1,12 +1,22 @@
 
 ## rocker/r2u: Rocker Containers for r2u
 
+### About r2u
+
 This repository provides containers for [r2u](https://eddelbuettel.github.io/r2u/). It extends /
 revisits the initial containers provided by the [r2u](https://eddelbuettel.github.io/r2u/) project.
 
 The containers are uploaded for each of the supported releases under their respective release names
 (focal, jammy, noble) and release versions (20.04, 22.04, 24.04).  Builds are for the amd64 platform
 and (on 24.04 aka noble only) also for arm64.
 
+### r2u4ci Variant
+
+The `r2u4ci` container adds a few more commands used in standard GitHub Actions.  While the standard
+`r2u` container can be used, this variants saves a few extra steps that would have to be taken each
+time in the CI setup.
+
+### Background
+
 Please see [motivation](motivation.md) for how it fits in with other Rocker containers.
 

jammy/Dockerfile

@@ -16,8 +16,10 @@ RUN useradd -s /bin/bash -m docker \
         && apt update \
         && apt upgrade -y \
 	&& apt install -y --no-install-recommends \
-		ca-certificates \
+	        ca-certificates \
+                lsb-release \
 		locales \
+                sudo \
 		wget \
 ## Install key and setup R repo at CRAN
         && wget -q -O - https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc \

noble/Dockerfile

@@ -14,19 +14,11 @@ RUN useradd -s /bin/bash -m docker \
 	&& usermod -a -G staff docker \
 ## Refresh apt, install minimal tools
         && apt update \
-        && apt upgrade -y \
-	&& apt install -y --no-install-recommends \
-		ca-certificates \
-		locales \
-		wget \
+        && apt upgrade --yes \
+        && apt install --yes --no-install-recommends \
+      	      ca-certificates \
+      	      locales \
 ## Install key and setup R repo at CRAN
-        && wget -q -O - https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc \
-                | tee -a /etc/apt/trusted.gpg.d/cran_ubuntu_key.asc  \
-        && echo "deb [signed-by=/etc/apt/trusted.gpg.d/cran_ubuntu_key.asc] https://cloud.r-project.org/bin/linux/ubuntu noble-cran40/" \
-                > /etc/apt/sources.list.d/cran.list \
-## Install key and setup r2u repo, also set 'pin preference'
-        && wget -q -O - https://r2u.stat.illinois.edu/ubuntu/dirk_eddelbuettel_pubkey.asc \
-                | tee -a /etc/apt/trusted.gpg.d/dirk_eddelbuettel_pubkey.asc \
         && echo "Package: *" > /etc/apt/preferences.d/99r2u \
         && echo "Pin: release o=CRAN-Apt Project" >> /etc/apt/preferences.d/99r2u \
         && echo "Pin: release l=CRAN-Apt Packages" >> /etc/apt/preferences.d/99r2u \
@@ -37,7 +29,13 @@ RUN useradd -s /bin/bash -m docker \
 	&& /usr/sbin/update-locale LANG=en_US.UTF-8
 
 ## New format *.sources instead of shorter *.list
+## Canonical sources for the key files are
+##   https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc
+##   https://r2u.stat.illinois.edu/ubuntu/dirk_eddelbuettel_pubkey.asc
 COPY r2u.sources /etc/apt/sources.list.d/
+COPY dirk_eddelbuettel_pubkey.asc /etc/apt/trusted.gpg.d/
+COPY cran.sources /etc/apt/sources.list.d/
+COPY marutter_pubkey.asc /etc/apt/trusted.gpg.d/cran_ubuntu_key.asc
 
 ## Set some variables
 ENV LC_ALL=en_US.UTF-8
@@ -49,7 +47,8 @@ ENV TZ=UTC
 # Now install R and littler, and create a link for littler in /usr/local/bin
 # Default CRAN repo is now set by R itself, and littler knows about it too
 RUN apt update \
-        && apt install -y --no-install-recommends \
+        && apt upgrade --yes \
+        && apt install --yes --no-install-recommends \
  		 r-base \
  		 r-base-dev \
  		 r-recommended \
@@ -84,5 +83,7 @@ RUN apt update \
         && echo "options(bspm.version.check=FALSE)" >> /etc/R/Rprofile.site \
         && echo "suppressMessages(bspm::enable())" >> /etc/R/Rprofile.site \
         && echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf.d/90local-no-recommends \
+        && apt update \
+        && apt upgrade --yes \
 	&& rm -rf /tmp/downloaded_packages/ /tmp/*.rds \
  	&& rm -rf /var/lib/apt/lists/*

noble/cran.sources

@@ -0,0 +1,6 @@
+Types: deb
+URIs: https://cloud.r-project.org/bin/linux/ubuntu
+Suites: noble-cran40/
+Components: 
+Signed-By: /etc/apt/trusted.gpg.d/cran_ubuntu_key.asc
+Enabled: yes