Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improve support for rockylinux 8 and add a few simplifications #199

Merged
merged 1 commit into from
Dec 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
IMAGE ?= rstudio/r-system-requirements
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
VARIANTS ?= focal jammy noble buster bullseye bookworm sid centos7 centos8 rockylinux8 rockylinux9 opensuse155 opensuse156 fedora39 fedora40 fedora41 alpine-3.17 alpine-3.18 alpine-3.19 alpine-3.20 alpine-edge

RULES ?= rules/*.json

Expand Down
8 changes: 8 additions & 0 deletions docker/rockylinux8/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
FROM rockylinux:8

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
12 changes: 11 additions & 1 deletion rules/atk.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,23 @@
}
]
},
{
"packages": ["atkmm2.36-dev"],
"constraints": [
{
"os": "linux",
"distribution": "alpine",
"versions": [ "edge" ]
}
]
},
{
"packages": ["atkmm-dev"],
"constraints": [
{
"os": "linux",
"distribution": "alpine",
"versions": [ "3.17", "3.18", "3.19", "3.20", "edge" ]
"versions": [ "3.17", "3.18", "3.19", "3.20" ]
}
]
}
Expand Down
19 changes: 18 additions & 1 deletion rules/chrome.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,24 @@
"constraints": [
{
"os": "linux",
"distribution": "rockylinux"
"distribution": "rockylinux",
"versions": ["9"]
}
]
},
{
"pre_install": [
{ "command": "dnf install -y dnf-plugins-core" },
{ "command": "dnf config-manager --set-enabled powertools" },
{ "command": "dnf install -y epel-release" }
],
"packages": ["chromium"],
"post_install": [],
"constraints": [
{
"os": "linux",
"distribution": "rockylinux",
"versions": ["8"]
}
]
},
Expand Down
5 changes: 5 additions & 0 deletions rules/eigen.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@
"os": "linux",
"distribution": "centos",
"versions": ["8"]
},
{
"os": "linux",
"distribution": "rockylinux",
"versions": ["8"]
}
]
},
Expand Down
8 changes: 7 additions & 1 deletion rules/gdal.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,11 @@
"os": "linux",
"distribution": "centos",
"versions": ["8"]
},
{
"os": "linux",
"distribution": "rockylinux",
"versions": ["8"]
}
]
},
Expand Down Expand Up @@ -139,7 +144,8 @@
"constraints": [
{
"os": "linux",
"distribution": "rockylinux"
"distribution": "rockylinux",
"versions": ["9"]
}
]
},
Expand Down
12 changes: 1 addition & 11 deletions rules/glpk.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,17 +58,7 @@
"os": "linux",
"distribution": "centos",
"versions": ["8"]
}
]
},
{
"packages": ["glpk-devel"],
"pre_install": [
{ "command": "dnf install -y dnf-plugins-core" },
{ "command": "dnf config-manager --set-enabled crb" },
{ "command": "dnf install -y epel-release" }
],
"constraints": [
},
{
"os": "linux",
"distribution": "rockylinux"
Expand Down
8 changes: 7 additions & 1 deletion rules/gpgme.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@
"os": "linux",
"distribution": "centos",
"versions": ["8"]
},
{
"os": "linux",
"distribution": "rockylinux",
"versions": ["8"]
}
]
},
Expand All @@ -51,7 +56,8 @@
"constraints": [
{
"os": "linux",
"distribution": "rockylinux"
"distribution": "rockylinux",
"versions": ["9"]
}
]
},
Expand Down
14 changes: 3 additions & 11 deletions rules/gsl.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,11 @@
"os": "linux",
"distribution": "redhat",
"versions": ["7", "8"]
}
]
},
{
"packages": ["gsl-devel"],
"pre_install": [
{ "command": "dnf install -y dnf-plugins-core" },
{ "command": "dnf config-manager --set-enabled crb" }
],
"constraints": [
},
{
"os": "linux",
"distribution": "rockylinux"
"distribution": "rockylinux",
"versions": ["8","9"]
}
]
},
Expand Down
8 changes: 7 additions & 1 deletion rules/leptonica.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@
"os": "linux",
"distribution": "centos",
"versions": ["8"]
},
{
"os": "linux",
"distribution": "rockylinux",
"versions": ["8"]
}
]
},
Expand All @@ -52,7 +57,8 @@
"constraints": [
{
"os": "linux",
"distribution": "rockylinux"
"distribution": "rockylinux",
"versions": ["9"]
}
]
},
Expand Down
8 changes: 7 additions & 1 deletion rules/libarchive.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@
"os": "linux",
"distribution": "centos",
"versions": ["8"]
},
{
"os": "linux",
"distribution": "rockylinux",
"versions": ["8"]
}
]
},
Expand All @@ -51,7 +56,8 @@
"constraints": [
{
"os": "linux",
"distribution": "rockylinux"
"distribution": "rockylinux",
"versions": ["9"]
}
]
},
Expand Down
3 changes: 2 additions & 1 deletion rules/libavfilter.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
"constraints": [
{
"os": "linux",
"distribution": "rockylinux"
"distribution": "rockylinux",
"versions": ["9"]
}
]
},
Expand Down
17 changes: 16 additions & 1 deletion rules/libjq.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,22 @@
"constraints": [
{
"os": "linux",
"distribution": "rockylinux"
"distribution": "rockylinux",
"versions": ["9"]
}
]
},
{
"packages": ["jq-devel"],
"pre_install": [
{ "command": "dnf install -y dnf-plugins-core" },
{ "command": "dnf config-manager --set-enabled powertools" }
],
"constraints": [
{
"os": "linux",
"distribution": "rockylinux",
"versions": ["8"]
}
]
},
Expand Down
8 changes: 7 additions & 1 deletion rules/libmagic.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@
"os": "linux",
"distribution": "centos",
"versions": ["8"]
},
{
"os": "linux",
"distribution": "rockylinux",
"versions": ["8"]
}
]
},
Expand All @@ -61,7 +66,8 @@
"constraints": [
{
"os": "linux",
"distribution": "rockylinux"
"distribution": "rockylinux",
"versions": ["9"]
}
]
},
Expand Down
21 changes: 7 additions & 14 deletions rules/libmecab.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
"constraints": [
{
"os": "linux",
"distribution": "rockylinux"
"distribution": "rockylinux",
"versions": ["9"]
}
]
},
Expand All @@ -47,6 +48,11 @@
{
"os": "linux",
"distribution": "fedora"
},
{
"os": "linux",
"distribution": "rockylinux",
"versions": ["8"]
}
]
},
Expand Down Expand Up @@ -85,19 +91,6 @@
"versions": ["9"]
}
]
},
{
"packages": ["mecab-devel"],
"pre_install": [
{ "command": "dnf install -y dnf-plugins-core" },
{ "command": "dnf config-manager --set-enabled crb" }
],
"constraints": [
{
"os": "linux",
"distribution": "rockylinux"
}
]
}
]
}
8 changes: 7 additions & 1 deletion rules/libmysqlclient.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@
{
"os": "linux",
"distribution": "fedora"
},
{
"os": "linux",
"distribution": "rockylinux",
"versions": ["8"]
}
]
},
Expand All @@ -62,7 +67,8 @@
"constraints": [
{
"os": "linux",
"distribution": "rockylinux"
"distribution": "rockylinux",
"versions": ["9"]
}
]
},
Expand Down
8 changes: 7 additions & 1 deletion rules/libprotobuf.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@
"os": "linux",
"distribution": "centos",
"versions": ["8"]
},
{
"os": "linux",
"distribution": "rockylinux",
"versions": ["8"]
}
]
},
Expand All @@ -71,7 +76,8 @@
"constraints": [
{
"os": "linux",
"distribution": "rockylinux"
"distribution": "rockylinux",
"versions": ["9"]
}
]
},
Expand Down
8 changes: 7 additions & 1 deletion rules/libsndfile.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@
"os": "linux",
"distribution": "centos",
"versions": ["8"]
},
{
"os": "linux",
"distribution": "rockylinux",
"versions": ["8"]
}
]
},
Expand All @@ -56,7 +61,8 @@
"constraints": [
{
"os": "linux",
"distribution": "rockylinux"
"distribution": "rockylinux",
"versions": ["9"]
}
]
},
Expand Down
8 changes: 7 additions & 1 deletion rules/odbc.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@
{
"os": "linux",
"distribution": "fedora"
},
{
"os": "linux",
"distribution": "rockylinux",
"versions": ["8"]
}
]
},
Expand All @@ -41,7 +46,8 @@
"constraints": [
{
"os": "linux",
"distribution": "rockylinux"
"distribution": "rockylinux",
"versions": ["9"]
}
]
},
Expand Down
Loading
Loading