diff --git a/Makefile b/Makefile index 7c1e475..85e0432 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ IMAGE ?= rstudio/r-system-requirements -VARIANTS ?= focal jammy buster bullseye bookworm sid centos7 centos8 rockylinux9 opensuse154 opensuse155 fedora36 fedora37 fedora38 alpine-3.15 alpine-3.16 alpine-3.17 alpine-3.18 alpine-edge +VARIANTS ?= focal jammy buster bullseye bookworm sid centos7 centos8 rockylinux9 opensuse154 opensuse155 fedora36 fedora37 fedora38 fedora39 alpine-3.15 alpine-3.16 alpine-3.17 alpine-3.18 alpine-edge RULES ?= rules/*.json diff --git a/README.md b/README.md index d288da8..2590e14 100644 --- a/README.md +++ b/README.md @@ -94,7 +94,7 @@ The rules in this catalog support the following operating systems: - openSUSE 15.4, 15.5 - SUSE Linux Enterprise 15 SP4, 15 SP5 - Debian 10, 11, 12, unstable -- Fedora 36, 37, 38 +- Fedora 36, 37, 38, 39 - Windows (for R 4.0+ only) \* Rocky Linux 8 is specified as `centos8` for backward compatibility. @@ -297,6 +297,7 @@ Available tags: - `fedora36` (Fedora 36) - `fedora37` (Fedora 37) - `fedora38` (Fedora 38) +- `fedora39` (Fedora 39) To build the images: diff --git a/docker/fedora39/Dockerfile b/docker/fedora39/Dockerfile new file mode 100644 index 0000000..eccb7bc --- /dev/null +++ b/docker/fedora39/Dockerfile @@ -0,0 +1,8 @@ +FROM fedora:39 + +RUN dnf upgrade -y -q && \ + dnf install -y glibc-langpack-en + +# Install jq +RUN curl -fsSL -o /usr/local/bin/jq https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 && \ + chmod +x /usr/local/bin/jq diff --git a/schema.json b/schema.json index 0b8625f..74436a8 100644 --- a/schema.json +++ b/schema.json @@ -196,7 +196,8 @@ "enum": [ "36", "37", - "38" + "38", + "39" ] }, "alpine": { diff --git a/systems.json b/systems.json index e0eb6a0..3389514 100644 --- a/systems.json +++ b/systems.json @@ -37,7 +37,7 @@ { "os": "linux", "distribution": "fedora", - "versions": [ "36", "37", "38" ] + "versions": [ "36", "37", "38", "39" ] }, { "os": "linux", diff --git a/test/test-packages.sh b/test/test-packages.sh index cf19f54..3173df7 100755 --- a/test/test-packages.sh +++ b/test/test-packages.sh @@ -24,6 +24,7 @@ declare -A os_identifiers=( [fedora36]='fedora' [fedora37]='fedora' [fedora38]='fedora' + [fedora39]='fedora' [alpine-3.15]='alpine' [alpine-3.16]='alpine' [alpine-3.17]='alpine' @@ -51,6 +52,7 @@ declare -A versions=( [fedora36]='36' [fedora37]='37' [fedora38]='38' + [fedora39]='39' [alpine-3.15]='3.15' [alpine-3.16]='3.16' [alpine-3.17]='3.17'