From 502e3dac00e4a61246a0ede041cb7bb36f617e4d Mon Sep 17 00:00:00 2001 From: Greg Lin Date: Tue, 3 Oct 2023 19:00:51 -0500 Subject: [PATCH] Add openSUSE/SLES 15.5 --- Makefile | 2 +- README.md | 5 +++-- docker/opensuse155/Dockerfile | 8 ++++++++ rules/java.json | 4 ++-- rules/libgit2.json | 2 +- rules/libicu.json | 4 ++-- rules/libmysqlclient.json | 4 ++-- rules/proj.json | 2 +- schema.json | 6 ++++-- systems.json | 4 ++-- test/test-packages.sh | 4 ++++ 11 files changed, 30 insertions(+), 15 deletions(-) create mode 100644 docker/opensuse155/Dockerfile diff --git a/Makefile b/Makefile index 3d106e5..7c1e475 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 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 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 bbe22af..d288da8 100644 --- a/README.md +++ b/README.md @@ -91,8 +91,8 @@ The rules in this catalog support the following operating systems: - CentOS 7 - Rocky Linux 8*, 9 - Red Hat Enterprise Linux 7, 8, 9 -- openSUSE 15.4 -- SUSE Linux Enterprise 15 SP4 +- openSUSE 15.4, 15.5 +- SUSE Linux Enterprise 15 SP4, 15 SP5 - Debian 10, 11, 12, unstable - Fedora 36, 37, 38 - Windows (for R 4.0+ only) @@ -293,6 +293,7 @@ Available tags: - `centos8` (Rocky Linux 8) - `rockylinux9` (Rocky Linux 9) - `opensuse154` (openSUSE 15.4) +- `opensuse155` (openSUSE 15.5) - `fedora36` (Fedora 36) - `fedora37` (Fedora 37) - `fedora38` (Fedora 38) diff --git a/docker/opensuse155/Dockerfile b/docker/opensuse155/Dockerfile new file mode 100644 index 0000000..2c18b91 --- /dev/null +++ b/docker/opensuse155/Dockerfile @@ -0,0 +1,8 @@ +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/rules/java.json b/rules/java.json index d1db6a9..bf7b0a5 100644 --- a/rules/java.json +++ b/rules/java.json @@ -90,12 +90,12 @@ { "os": "linux", "distribution": "opensuse", - "versions": ["15.4"] + "versions": ["15.4", "15.5"] }, { "os": "linux", "distribution": "sle", - "versions": ["15.4"] + "versions": ["15.4", "15.5"] } ] }, diff --git a/rules/libgit2.json b/rules/libgit2.json index 772fef5..d9804b8 100644 --- a/rules/libgit2.json +++ b/rules/libgit2.json @@ -149,7 +149,7 @@ { "os": "linux", "distribution": "sle", - "versions": ["15.0", "15.2", "15.3", "15.4"] + "versions": ["15.0", "15.2", "15.3", "15.4", "15.5"] } ] }, diff --git a/rules/libicu.json b/rules/libicu.json index 207cca6..ae774fb 100644 --- a/rules/libicu.json +++ b/rules/libicu.json @@ -66,12 +66,12 @@ { "os": "linux", "distribution": "opensuse", - "versions": ["15.3", "15.4"] + "versions": ["15.3", "15.4", "15.5"] }, { "os": "linux", "distribution": "sle", - "versions": ["15.3", "15.4"] + "versions": ["15.3", "15.4", "15.5"] } ] }, diff --git a/rules/libmysqlclient.json b/rules/libmysqlclient.json index 20a8776..ebb490d 100644 --- a/rules/libmysqlclient.json +++ b/rules/libmysqlclient.json @@ -100,12 +100,12 @@ { "os": "linux", "distribution": "opensuse", - "versions": ["15.0", "15.2", "15.3", "15.4"] + "versions": ["15.0", "15.2", "15.3", "15.4", "15.5"] }, { "os": "linux", "distribution": "sle", - "versions": ["15.0", "15.2", "15.3", "15.4"] + "versions": ["15.0", "15.2", "15.3", "15.4", "15.5"] } ] }, diff --git a/rules/proj.json b/rules/proj.json index ad3ab41..5d08ebc 100644 --- a/rules/proj.json +++ b/rules/proj.json @@ -131,7 +131,7 @@ { "os": "linux", "distribution": "opensuse", - "versions": ["15.2", "15.3", "15.4"] + "versions": ["15.2", "15.3", "15.4", "15.5"] } ] }, diff --git a/schema.json b/schema.json index 9d7e192..0b8625f 100644 --- a/schema.json +++ b/schema.json @@ -178,7 +178,8 @@ "15.0", "15.2", "15.3", - "15.4" + "15.4", + "15.5" ] }, "sle": { @@ -187,7 +188,8 @@ "15.0", "15.2", "15.3", - "15.4" + "15.4", + "15.5" ] }, "fedora": { diff --git a/systems.json b/systems.json index 02fe797..e0eb6a0 100644 --- a/systems.json +++ b/systems.json @@ -27,12 +27,12 @@ { "os": "linux", "distribution": "opensuse", - "versions": [ "42.3", "15.0", "15.2", "15.3", "15.4" ] + "versions": [ "42.3", "15.0", "15.2", "15.3", "15.4", "15.5" ] }, { "os": "linux", "distribution": "sle", - "versions": [ "12.3", "15.0", "15.2", "15.3", "15.4" ] + "versions": [ "12.3", "15.0", "15.2", "15.3", "15.4", "15.5" ] }, { "os": "linux", diff --git a/test/test-packages.sh b/test/test-packages.sh index 894b6b1..cf19f54 100755 --- a/test/test-packages.sh +++ b/test/test-packages.sh @@ -18,7 +18,9 @@ declare -A os_identifiers=( [rhel8]='redhat' [rhel9]='redhat' [opensuse154]='opensuse' + [opensuse155]='opensuse' [sle154]='sle' + [sle155]='sle' [fedora36]='fedora' [fedora37]='fedora' [fedora38]='fedora' @@ -43,7 +45,9 @@ declare -A versions=( [rhel8]='8' [rhel9]='9' [opensuse154]='15.4' + [opensuse155]='15.5' [sle154]='15.4' + [sle155]='15.5' [fedora36]='36' [fedora37]='37' [fedora38]='38'