From ec82ff69a9678bdd84037284eb901b2fbb8a9e47 Mon Sep 17 00:00:00 2001 From: Chris Stefano Date: Sun, 29 Dec 2024 13:40:33 +0000 Subject: [PATCH 1/7] fix docker build deprecation warnings --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3398c58..d76a3aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,10 +5,10 @@ ARG R_VERSION ARG CRAN_VERSION # Set default locale -ENV LANG C.UTF-8 +ENV LANG=C.UTF-8 # Set default timezone -ENV TZ UTC +ENV TZ=UTC # copy over helpers script COPY helpers.R /etc/R/helpers.R From 4b410afbd62c91fa2a2cc6ba9696022166c9859d Mon Sep 17 00:00:00 2001 From: Chris Stefano Date: Sun, 29 Dec 2024 13:40:56 +0000 Subject: [PATCH 2/7] remove `pandoc-citeproc` package as no longer available --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d76a3aa..ddfc77b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,7 +38,6 @@ RUN apt-get update -q \ locales \ lsb-release \ pandoc \ - pandoc-citeproc \ perl \ software-properties-common \ sudo \ From 0190d08ad3465a31e5d15dcde5107ff2b505b1ca Mon Sep 17 00:00:00 2001 From: Chris Stefano Date: Sun, 29 Dec 2024 13:43:51 +0000 Subject: [PATCH 3/7] remove `cran2deb4ubuntu` PPA as no support for `nobel` see https://github.com/eddelbuettel/r2u for upgrade path --- Dockerfile | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index ddfc77b..808ebd4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -59,18 +59,6 @@ RUN distro=$(lsb_release -c | awk '{print $2}') \ && echo "deb-src [signed-by=/etc/apt/keyrings/cloud.r-project.org.gpg] https://cloud.r-project.org/bin/linux/ubuntu ${distro}-$CRAN_VERSION/" >> /etc/apt/sources.list.d/cloud.r-project.org.list \ && rm -rf $GNUPGHOME -# add CRAN modules package configurations -# https://launchpad.net/~c2d4u.team/+archive/ubuntu/c2d4u4.0+ -RUN distro=$(lsb_release -c | awk '{print $2}') \ - && keyid=6E12762B81063D17BDDD3142F142A4D99F16EB04 \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --recv-keys --keyserver keyserver.ubuntu.com $keyid \ - && mkdir -p /etc/apt/keyrings \ - && gpg --export $keyid > /etc/apt/keyrings/c2d4u.team.gpg \ - && echo "deb [signed-by=/etc/apt/keyrings/c2d4u.team.gpg] https://ppa.launchpadcontent.net/c2d4u.team/c2d4u4.0+/ubuntu/ ${distro} main" > /etc/apt/sources.list.d/c2d4u.team.list \ - && echo "deb-src [signed-by=/etc/apt/keyrings/c2d4u.team.gpg] https://ppa.launchpadcontent.net/c2d4u.team/c2d4u4.0+/ubuntu/ ${distro} main" >> /etc/apt/sources.list.d/c2d4u.team.list \ - && rm -rf $GNUPGHOME - # install TinyTeX RUN curl -sSL "https://yihui.org/tinytex/install-bin-unix.sh" | sh \ && /root/.TinyTeX/bin/*/tlmgr path remove \ From 36e7090340162ecefbda477b843bbd0e73c91653 Mon Sep 17 00:00:00 2001 From: Chris Stefano Date: Sun, 29 Dec 2024 13:44:55 +0000 Subject: [PATCH 4/7] bump ubuntu version to 24.04 (nobel) --- Makevars | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makevars b/Makevars index 3cc4228..0ff9a01 100644 --- a/Makevars +++ b/Makevars @@ -1,4 +1,4 @@ -UBUNTU_VERSION:=22.04 +UBUNTU_VERSION:=24.04 R_VERSION:=4.2.2 CRAN_VERSION:=cran40 From 439d98010cbccae6378af511a2ac8f26fd755aaa Mon Sep 17 00:00:00 2001 From: Chris Stefano Date: Sun, 29 Dec 2024 13:45:37 +0000 Subject: [PATCH 5/7] bump default R version to 4.4.2 --- .github/workflows/build-publish.yml | 2 -- Makevars | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build-publish.yml b/.github/workflows/build-publish.yml index 6dd286c..af90f07 100644 --- a/.github/workflows/build-publish.yml +++ b/.github/workflows/build-publish.yml @@ -22,8 +22,6 @@ jobs: strategy: matrix: r_version: - - 4.2.3 - - 4.3.3 - 4.4.2 steps: diff --git a/Makevars b/Makevars index 0ff9a01..7bf9ed1 100644 --- a/Makevars +++ b/Makevars @@ -1,5 +1,5 @@ UBUNTU_VERSION:=24.04 -R_VERSION:=4.2.2 +R_VERSION:=4.4.2 CRAN_VERSION:=cran40 MAINTAINER:=Chris Stefano From 8cc9ec475e2657e56d313f787f174875b0715c0a Mon Sep 17 00:00:00 2001 From: Chris Stefano Date: Sun, 29 Dec 2024 13:49:18 +0000 Subject: [PATCH 6/7] update version table --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 50f1ac2..e9eab21 100644 --- a/README.md +++ b/README.md @@ -374,8 +374,8 @@ available on [GitHub Container Registry][ghcr], including: | Ubuntu Version | R Version | Base Tag | Build Tag | Shiny Tag | Plumber Tag | |----------------|-----------|---------------|---------------|---------------|-----------------| -| `22.04` | `4.4.2` | `latest` | `build` | `shiny` | `plumber` | -| `22.04` | `4.4.2` | | `4.4.2-build` | `4.4.2-shiny` | `4.4.2-plumber` | +| `24.04` | `4.4.2` | `latest` | `build` | `shiny` | `plumber` | +| `24.04` | `4.4.2` | | `4.4.2-build` | `4.4.2-shiny` | `4.4.2-plumber` | | `22.04` | `4.3.3` | | `4.3.3-build` | `4.3.3-shiny` | `4.3.3-plumber` | | `22.04` | `4.2.3` | | `4.2.3-build` | `4.2.3-shiny` | `4.2.3-plumber` | | `22.04` | `4.2.2` | | `4.2.2-build` | `4.2.2-shiny` | `4.2.2-plumber` | From ff97ee17bbd32a387422abd0f15f09dd1b83c0f3 Mon Sep 17 00:00:00 2001 From: Chris Stefano Date: Mon, 30 Dec 2024 10:28:42 +0000 Subject: [PATCH 7/7] update unit tests from https://github.com/rstudio/r-docker/tree/main/test suite. --- test/units/README.md | 4 ++-- test/units/test.R | 6 ++++-- test/units/test.sh | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/test/units/README.md b/test/units/README.md index d75f07f..05f7585 100644 --- a/test/units/README.md +++ b/test/units/README.md @@ -1,3 +1,3 @@ -Tests taken and adapted from https://github.com/rstudio/r-docker/tree/master/test suite. +Tests taken and adapted from https://github.com/rstudio/r-docker/tree/main/test suite. -See https://github.com/rstudio/r-docker/blob/master/LICENSE for LICENSE. +See https://github.com/rstudio/r-docker/blob/main/LICENSE for LICENSE. diff --git a/test/units/test.R b/test/units/test.R index c4e1b01..9f8a6ca 100644 --- a/test/units/test.R +++ b/test/units/test.R @@ -46,8 +46,10 @@ tryCatch(capabilities(), warning = function(w) { # Check graphics devices # https://stat.ethz.ch/R-manual/R-devel/library/grDevices/html/Devices.html -for (dev_name in c("png", "jpeg", "tiff", "svg", "bmp", "pdf", "postscript", - "cairo_pdf", "cairo_ps")) { +devices <- c("png", "jpeg", "tiff", "svg", "bmp", "pdf", "postscript", + if (getRversion() < "4.4.0") c("xfig", "pictex"), + "cairo_pdf", "cairo_ps") +for (dev_name in devices) { # Skip unsupported graphics devices (e.g. tiff in R >= 3.3 on CentOS 6) if (dev_name %in% names(capabilities()) && capabilities(dev_name) == FALSE) { next diff --git a/test/units/test.sh b/test/units/test.sh index d448c6d..888c740 100755 --- a/test/units/test.sh +++ b/test/units/test.sh @@ -20,6 +20,7 @@ Rscript $DIR/testpkg/tests/test.R # Check that TinyTeX and Pandoc were installed correctly tlmgr --version +pandoc --version echo -e '# Title\ncontent' | pandoc --output $DIR/test.pdf rm $DIR/test.pdf