diff --git a/Makefile b/Makefile index a8de591..601fd62 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ IMAGE ?= rstudio/r-system-requirements -VARIANTS ?= focal jammy noble buster bullseye bookworm sid centos7 centos8 rockylinux8 rockylinux9 opensuse155 opensuse156 fedora39 fedora40 fedora41 alpine-3.18 alpine-3.19 alpine-3.20 alpine-3.21 alpine-edge +VARIANTS ?= focal jammy noble bullseye bookworm sid centos7 centos8 rockylinux8 rockylinux9 opensuse156 fedora40 fedora41 alpine-3.18 alpine-3.19 alpine-3.20 alpine-3.21 alpine-edge RULES ?= rules/*.json diff --git a/README.md b/README.md index 0f25ed7..b21e7f4 100644 --- a/README.md +++ b/README.md @@ -50,10 +50,10 @@ The rules in this catalog support the following operating systems: - CentOS 7 - Rocky Linux 8[^1], 9 - Red Hat Enterprise Linux 7, 8, 9 -- openSUSE 15.5, 15.6 -- SUSE Linux Enterprise 15 SP5, 15 SP6 -- Debian 10, 11, 12, unstable -- Fedora 39, 40, 41 +- openSUSE 15.6 +- SUSE Linux Enterprise 15 SP6 +- Debian 11, 12, unstable +- Fedora 40, 41 - Windows (for R 4.0+ only) [^1]: Rocky Linux 8 is specified as `centos8` for backward compatibility. diff --git a/docker/buster/Dockerfile b/docker/buster/Dockerfile deleted file mode 100644 index f600151..0000000 --- a/docker/buster/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM debian:10 - -RUN apt-get update -qq && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y curl - -# 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/docker/fedora39/Dockerfile b/docker/fedora39/Dockerfile deleted file mode 100644 index eccb7bc..0000000 --- a/docker/fedora39/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -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/docker/opensuse155/Dockerfile b/docker/opensuse155/Dockerfile deleted file mode 100644 index 2c18b91..0000000 --- a/docker/opensuse155/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM opensuse/leap:15.5 - -RUN zypper --quiet --non-interactive update && \ - zypper --non-interactive install curl - -# Install jq -RUN curl -fsSL -o /usr/local/bin/jq https://github.com/stedolan/jq/releases/download/jq-1.7/jq-linux64 && \ - chmod +x /usr/local/bin/jq diff --git a/test/test-packages.sh b/test/test-packages.sh index 82e5c93..24bc4e6 100755 --- a/test/test-packages.sh +++ b/test/test-packages.sh @@ -8,7 +8,6 @@ declare -A os_identifiers=( [focal]='ubuntu' [jammy]='ubuntu' [noble]='ubuntu' - [buster]='debian' [bullseye]='debian' [bookworm]='debian' [sid]='debian' @@ -19,11 +18,8 @@ declare -A os_identifiers=( [rhel7]='redhat' [rhel8]='redhat' [rhel9]='redhat' - [opensuse155]='opensuse' [opensuse156]='opensuse' - [sle155]='sle' [sle156]='sle' - [fedora39]='fedora' [fedora40]='fedora' [fedora41]='fedora' [alpine-3.18]='alpine' @@ -37,7 +33,6 @@ declare -A versions=( [focal]='20.04' [jammy]='22.04' [noble]='24.04' - [buster]='10' [bullseye]='11' [bookworm]='12' [sid]='unstable' @@ -48,11 +43,8 @@ declare -A versions=( [rhel7]='7' [rhel8]='8' [rhel9]='9' - [opensuse155]='15.5' [opensuse156]='15.6' - [sle155]='15.5' [sle156]='15.6' - [fedora39]='39' [fedora40]='40' [fedora41]='41' [alpine-3.18]='3.18'