summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Shapiro2019-08-16 16:02:35 -0500
committerJoel Shapiro2019-08-16 16:02:35 -0500
commit9fab518213bba83d3f736be0a0011042f99b4368 (patch)
treea79d7fb41a92742a9b024471ea65c2f328ce929a
parent4616e245d0a35dc005be27f99103b78be77b9f54 (diff)
downloadaur-9fab518213bba83d3f736be0a0011042f99b4368.tar.gz
uppdate, remove nvidia-container-runtime-hook dep, add licence, add note about switching to nvidia-container-toolkit
-rw-r--r--.SRCINFO7
-rw-r--r--.gitignore8
-rw-r--r--PKGBUILD27
-rw-r--r--nvidia-docker.install15
4 files changed, 31 insertions, 26 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 904f4fe6beb..8f0e9f5b7de 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,14 @@
pkgbase = nvidia-docker
pkgdesc = Build and run Docker containers leveraging NVIDIA GPUs
pkgver = 2.0.3
- pkgrel = 4
+ pkgrel = 5
url = https://github.com/NVIDIA/nvidia-docker
arch = any
license = BSD
depends = docker
depends = nvidia-container-runtime
- depends = nvidia-container-runtime-hook
- source = https://github.com/NVIDIA/nvidia-docker/archive/v2.0.3.tar.gz
- sha256sums = f94c963b6d2a537711c7e8e9e3c3fe3d9f9fddc48599d5a411119276a33763db
+ source = https://github.com/NVIDIA/nvidia-docker/archive/v2.1.1.tar.gz
+ sha256sums = 09aa48c3eb6be71fae66e0f2e966aaf85ddf24102a51edc5234f9e60a39d3815
pkgname = nvidia-docker
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000000..e22dd4e768f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+*.tar
+*.tar.*
+
+src/
+pkg/
+
+nvidia-docker/
+
diff --git a/PKGBUILD b/PKGBUILD
index 7ea403a53f8..94af0f88699 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,28 @@
-# Maintainer: Ivan Semkin (ivan at semkin dot ru)
+# Maintainer: Joel Shapiro <jshapiro at nvidia dot com>
+# Maintainer: Kien Dang <mail at kien dot ai>
pkgname=nvidia-docker
+
pkgver=2.0.3
-pkgrel=4
+pkgrel=5
+
+_actual_pkgver=2.1.1 # tool's internal version hasn't bumped for some reason
+
pkgdesc='Build and run Docker containers leveraging NVIDIA GPUs'
url='https://github.com/NVIDIA/nvidia-docker'
arch=(any)
license=(BSD)
-depends=(docker nvidia-container-runtime nvidia-container-runtime-hook)
-source=("https://github.com/NVIDIA/nvidia-docker/archive/v$pkgver.tar.gz")
-sha256sums=('f94c963b6d2a537711c7e8e9e3c3fe3d9f9fddc48599d5a411119276a33763db')
+
+depends=(docker nvidia-container-runtime)
+
+source=("https://github.com/NVIDIA/nvidia-docker/archive/v$_actual_pkgver.tar.gz")
+sha256sums=('09aa48c3eb6be71fae66e0f2e966aaf85ddf24102a51edc5234f9e60a39d3815')
package() {
- cd "${pkgname}-${pkgver}"
+ cd "${pkgname}-${_actual_pkgver}"
- install -d ${pkgdir}/usr/bin
- install -m755 ${pkgname} ${pkgdir}/usr/bin/${pkgname}
-
- install -d ${pkgdir}/etc/docker
- install -m644 daemon.json ${pkgdir}/etc/docker/daemon.json
+ install -D -m755 "nvidia-docker" "${pkgdir}/usr/bin/nvidia-docker"
+ install -D -m644 "daemon.json" "${pkgdir}/etc/docker/daemon.json"
+ install -D -m644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
# vim:set ts=2 sw=2 et:
diff --git a/nvidia-docker.install b/nvidia-docker.install
index f8cf63443c8..65b78946a28 100644
--- a/nvidia-docker.install
+++ b/nvidia-docker.install
@@ -1,19 +1,12 @@
post_install() {
cat << EOF
-=> Prior to running 'CUDA'-containers, ensure that the nvidia-docker-plugin
- is loaded. -> https://github.com/nvidia/nvidia-docker/wiki/Installation-(version-2.0)
-
-sudo pkill -SIGHUP dockerd
-
+NOTE: nvidia-docker is deprecated in upstream in favor of docker's new native
+ gpu support using the nvidia-container-toolkit package.
+ For more info, see:
+https://wiki.archlinux.org/index.php/Docker#Run_GPU_accelerated_Docker_containers_with_NVIDIA_GPUs
EOF
}
post_upgrade() {
post_install
}
-
-post_remove() {
- cat << EOF
-=> Don't forget to disable/stop a potentially running nvidia-docker.service
-EOF
-}