funkemunky/packages
1
0
Fork 0
mirror of https://github.com/terrapkg/packages.git synced 2026-05-31 09:01:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(nvidia-container-toolkit): cleanup (#3182)

Browse Source 
* Fix: nvidia-container-toolkit

Changes:
- Dropped rootless Docker from the post script because Fedora's Docker (`moby-engine`) doesn't support this the same way
- Added postun scriptlet
- Cleaned up scriptlet using `try-restart` which should not fail if there is no service to restart
  - This is how Fedora seems to do `systemctl` scriptlets
- Added `/etc/cdi/nvidia.yaml` to tracked (but ghost) config files
- Added `nvidia-driver and podman` supplements flag

Signed-off-by: Gil <rockgrub@disroot.org>

* Change: Post and postun deps

Signed-off-by: Gil <rockgrub@disroot.org>

---------

Signed-off-by: Gil <rockgrub@disroot.org>
This commit is contained in:
Gil
2025-02-03 01:54:42 -06:00
committed by GitHub
parent 6fed263c54
commit 6a2e4ca667
1 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
anda/system/nvidia/nvidia-container-toolkit/nvidia-container-toolkit.spec
+33 -32
View File
@@ -1,17 +1,21 @@
Name: nvidia-container-toolkit
Version: 1.17.4
Release: 1%?dist
Summary: NVIDIA Container Toolkit
License: Apache-2.0
Group: Development/Tools/Other
URL: https://github.com/NVIDIA/nvidia-container-toolkit
Source0: https://github.com/NVIDIA/%{name}/archive/v%{version}/nvidia-container-toolkit-v%{version}.tar.gz
BuildRequires: containers-common
BuildRequires: golang >= 1.16
Requires: libnvidia-container-tools
Supplements: (nvidia-driver and moby-engine)
Supplements: (nvidia-driver and cri-o)
Supplements: (nvidia-driver and containerd)
Name: nvidia-container-toolkit
Version: 1.17.4
Release: 2%?dist
Summary: NVIDIA Container Toolkit
License: Apache-2.0
Group: Development/Tools/Other
URL: https://github.com/NVIDIA/nvidia-container-toolkit
Source0: https://github.com/NVIDIA/%{name}/archive/v%{version}/nvidia-container-toolkit-v%{version}.tar.gz
BuildRequires: containers-common
BuildRequires: golang >= 1.16
BuildRequires: systemd-rpm-macros
Requires: libnvidia-container-tools
Requires(post): systemd
Requires(postun): systemd
Supplements: (nvidia-driver and moby-engine)
Supplements: (nvidia-driver and cri-o)
Supplements: (nvidia-driver and containerd)
Supplements: (nvidia-driver and podman)
%description
@@ -42,29 +46,25 @@ mkdir -p %{buildroot}%{_sysconfdir}/nvidia-container-runtime
%post
if rpm -q --quiet moby-engine; then
if 'docker info -f "{{println .SecurityOptions}}" | grep rootless'; then
nvidia-ctk runtime configure --runtime=docker --config="$HOME"/.config/docker/daemon.json
if systemctl --user is-running docker >/dev/null; then
systemctl --user restart docker
fi
nvidia-ctk config --set nvidia-container-cli.no-cgroups --in-place
else nvidia-ctk runtime configure --runtime=docker
if systemctl is-running docker >/dev/null; then
systemctl restart docker
fi
fi
nvidia-ctk runtime configure --runtime=docker
/bin/systemctl --system try-restart docker.service &>/dev/null || :
elif rpm -q --quiet containerd; then
nvidia-ctk runtime configure --runtime=containerd
if systemctl is-running containerd >/dev/null; then
systemctl restart containerd
fi
/bin/systemctl --system try-restart containerd.service &>/dev/null || :
elif rpm -q --quiet cri-o; then
nvidia-ctk runtime configure --runtime=crio
if systemctl is-running crio >/dev/null; then
systemctl restart crio
fi
/bin/systemctl --system try-restart crio.service &>/dev/null || :
elif rpm -q --quiet podman; then
nvidia-ctk cdi generate --output=/etc/cdi/nvidia.yaml
nvidia-ctk cdi generate --output=/etc/cdi/nvidia.yaml
fi
%postun
if rpm -q --quiet moby-engine; then
/bin/systemctl --system try-restart docker.service &>/dev/null || :
elif rpm -q --quiet containerd; then
/bin/systemctl --system try-restart containerd.service &>/dev/null || :
elif rpm -q --quiet cri-o; then
/bin/systemctl --system try-restart crio.service &>/dev/null || :
fi
%files
@@ -75,6 +75,7 @@ fi
%{_bindir}/nvidia-container-runtime-hook
%dir %{_sysconfdir}/nvidia-container-runtime
%ghost %config(noreplace) %{_sysconfdir}/nvidia-container-runtime/config.toml
%ghost %config(noreplace) %{_sysconfdir}/cdi/nvidia.yaml
%changelog
%autochangelog