diff --git a/Makefile b/Makefile index 7e70824..f36f6b9 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ IMAGE ?= rstudio/r-system-requirements -VARIANTS ?= focal jammy noble buster bullseye bookworm sid centos7 centos8 rockylinux9 opensuse155 opensuse156 fedora38 fedora39 fedora40 alpine-3.17 alpine-3.18 alpine-3.19 alpine-3.20 alpine-edge +VARIANTS ?= focal jammy noble buster bullseye bookworm sid centos7 centos8 rockylinux9 opensuse155 opensuse156 fedora39 fedora40 fedora41 alpine-3.17 alpine-3.18 alpine-3.19 alpine-3.20 alpine-edge RULES ?= rules/*.json diff --git a/README.md b/README.md index 70228e1..0f25ed7 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ The rules in this catalog support the following operating systems: - openSUSE 15.5, 15.6 - SUSE Linux Enterprise 15 SP5, 15 SP6 - Debian 10, 11, 12, unstable -- Fedora 38, 39, 40 +- Fedora 39, 40, 41 - Windows (for R 4.0+ only) [^1]: Rocky Linux 8 is specified as `centos8` for backward compatibility. diff --git a/docker/fedora38/Dockerfile b/docker/fedora41/Dockerfile similarity index 93% rename from docker/fedora38/Dockerfile rename to docker/fedora41/Dockerfile index 292a554..ec08026 100644 --- a/docker/fedora38/Dockerfile +++ b/docker/fedora41/Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:38 +FROM fedora:41 RUN dnf upgrade -y -q && \ dnf install -y glibc-langpack-en diff --git a/schema.json b/schema.json index ab934d8..bea5aff 100644 --- a/schema.json +++ b/schema.json @@ -201,7 +201,8 @@ "37", "38", "39", - "40" + "40", + "41" ] }, "alpine": { diff --git a/systems.json b/systems.json index d22fd49..5b82f5f 100644 --- a/systems.json +++ b/systems.json @@ -37,7 +37,7 @@ { "os": "linux", "distribution": "fedora", - "versions": [ "36", "37", "38", "39", "40" ] + "versions": [ "36", "37", "38", "39", "40", "41" ] }, { "os": "linux", diff --git a/test/test-packages.sh b/test/test-packages.sh index d99bfcc..72a118c 100755 --- a/test/test-packages.sh +++ b/test/test-packages.sh @@ -22,9 +22,9 @@ declare -A os_identifiers=( [opensuse156]='opensuse' [sle155]='sle' [sle156]='sle' - [fedora38]='fedora' [fedora39]='fedora' [fedora40]='fedora' + [fedora41]='fedora' [alpine-3.17]='alpine' [alpine-3.18]='alpine' [alpine-3.19]='alpine' @@ -50,9 +50,9 @@ declare -A versions=( [opensuse156]='15.6' [sle155]='15.5' [sle156]='15.6' - [fedora38]='38' [fedora39]='39' [fedora40]='40' + [fedora41]='41' [alpine-3.17]='3.17' [alpine-3.18]='3.18' [alpine-3.19]='3.19'