rename hook to toolkit everywhere

Signed-off-by: NRenaud Gaubert <rgaubert@nvidia.com>

Makefile

@@ -7,27 +7,27 @@ all: ubuntu18.04 ubuntu16.04 debian9 centos7 amzn2 amzn1
 runtime: runtime-ubuntu18.04 runtime-ubuntu16.04 runtime-debian9 runtime-centos7 runtime-amzn2 runtime-amzn1
 
 # Build all packages for a specific distribution.
-ubuntu18.04: runtime-ubuntu18.04 hook-ubuntu18.04
+ubuntu18.04: runtime-ubuntu18.04 toolkit-ubuntu18.04
 
-ubuntu16.04: runtime-ubuntu16.04 hook-ubuntu16.04
+ubuntu16.04: runtime-ubuntu16.04 toolkit-ubuntu16.04
 
-ubuntu14.04: runtime-ubuntu14.04 hook-ubuntu14.04
+ubuntu14.04: runtime-ubuntu14.04 toolkit-ubuntu14.04
 
-debian9: runtime-debian9 hook-debian9
+debian9: runtime-debian9 toolkit-debian9
 
-debian8: runtime-debian8 hook-debian8
+debian8: runtime-debian8 toolkit-debian8
 
-centos7: runtime-centos7 hook-centos7
+centos7: runtime-centos7 toolkit-centos7
 
-amzn2: runtime-amzn2 hook-amzn2
+amzn2: runtime-amzn2 toolkit-amzn2
 
-amzn1: runtime-amzn1 hook-amzn1
+amzn1: runtime-amzn1 toolkit-amzn1
 
 base-%:
 	make -C $(CURDIR)/base $*
 
-hook-%: base-%
-	make -C $(CURDIR)/hook $*
+toolkit-%: base-%
+	make -C $(CURDIR)/toolkit $*
 
 runtime-%: base-%
 	make -C $(CURDIR)/runtime $*

base/Makefile

@@ -7,7 +7,7 @@ GOLANG_VERSION := 1.10.3
 .NOTPARALLEL:
 .PHONY: all
 
-all: ubuntu16.04 ubuntu14.04 debian9 debian8 centos7 amzn2 amzn1
+all: ubuntu18.04 ubuntu16.04 ubuntu14.04 debian9 debian8 centos7 amzn2 amzn1
 
 ubuntu%: $(CURDIR)/Dockerfile.ubuntu
 	$(DOCKER) build --build-arg VERSION_ID="$*" \

runtime/debian/control

@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9)
 
 Package: nvidia-container-runtime
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, nvidia-container-runtime-hook (<< 2.0.0), libseccomp2
+Depends: ${shlibs:Depends}, ${misc:Depends}, nvidia-container-toolkit (<< 2.0.0), libseccomp2
 Description: NVIDIA container runtime
  Provides a modified version of runc allowing users to run GPU enabled
  containers.

runtime/rpm/SPECS/nvidia-container-runtime.spec

@@ -14,8 +14,8 @@ License: ASL 2.0
 Source0: nvidia-container-runtime
 Source1: LICENSE
 
-Obsoletes: nvidia-container-runtime < 3.0.0
-Requires: nvidia-container-runtime-hook < 2.0.0
+Obsoletes: nvidia-container-runtime < 2.0.0
+Requires: nvidia-container-toolkit < 2.0.0
 Requires: libseccomp
 
 %description

hook/Dockerfile.amzn → toolkit/Dockerfile.amzn

@@ -9,14 +9,14 @@ ENV VERSION $PKG_VERS
 ENV RELEASE $PKG_REV
 
 # output directory
-ENV DIST_DIR=/tmp/nvidia-container-runtime-hook-$PKG_VERS/SOURCES
+ENV DIST_DIR=/tmp/nvidia-container-toolkit-$PKG_VERS/SOURCES
 RUN mkdir -p $DIST_DIR
 
-# nvidia-container-runtime-hook
-COPY nvidia-container-runtime-hook/ $GOPATH/src/nvidia-container-runtime-hook
+# nvidia-container-toolkit
+COPY nvidia-container-toolkit/ $GOPATH/src/nvidia-container-toolkit
 
-RUN go get -ldflags "-s -w" -v nvidia-container-runtime-hook && \
-    mv $GOPATH/bin/nvidia-container-runtime-hook $DIST_DIR/nvidia-container-runtime-hook
+RUN go get -ldflags "-s -w" -v nvidia-container-toolkit && \
+    mv $GOPATH/bin/nvidia-container-toolkit $DIST_DIR/nvidia-container-toolkit
 
 COPY config.toml.amzn $DIST_DIR/config.toml
 
@@ -36,5 +36,5 @@ CMD arch=$(uname -m) && \
              -D "_topdir $PWD" \
              -D "version $VERSION" \
              -D "release $RELEASE" \
-             SPECS/nvidia-container-runtime-hook.spec && \
+             SPECS/nvidia-container-toolkit.spec && \
     mv RPMS/$arch/*.rpm /dist

hook/Dockerfile.centos → toolkit/Dockerfile.centos

@@ -9,14 +9,14 @@ ENV VERSION $PKG_VERS
 ENV RELEASE $PKG_REV
 
 # output directory
-ENV DIST_DIR=/tmp/nvidia-container-runtime-hook-$PKG_VERS/SOURCES
+ENV DIST_DIR=/tmp/nvidia-container-toolkit-$PKG_VERS/SOURCES
 RUN mkdir -p $DIST_DIR /dist
 
-# nvidia-container-runtime-hook
-COPY nvidia-container-runtime-hook/ $GOPATH/src/nvidia-container-runtime-hook
+# nvidia-container-toolkit
+COPY nvidia-container-toolkit/ $GOPATH/src/nvidia-container-toolkit
 
-RUN go get -ldflags "-s -w" -v nvidia-container-runtime-hook && \
-    mv $GOPATH/bin/nvidia-container-runtime-hook $DIST_DIR/nvidia-container-runtime-hook
+RUN go get -ldflags "-s -w" -v nvidia-container-toolkit && \
+    mv $GOPATH/bin/nvidia-container-toolkit $DIST_DIR/nvidia-container-toolkit
 
 COPY config.toml.centos $DIST_DIR/config.toml
 
@@ -34,5 +34,5 @@ CMD arch=$(uname -m) && \
              -D "_topdir $PWD" \
              -D "version $VERSION" \
              -D "release $RELEASE" \
-             SPECS/nvidia-container-runtime-hook.spec && \
+             SPECS/nvidia-container-toolkit.spec && \
     mv RPMS/$arch/*.rpm /dist

hook/Dockerfile.debian → toolkit/Dockerfile.debian

@@ -11,14 +11,14 @@ ENV REVISION "$PKG_VERS-$PKG_REV"
 ENV SECTION ""
 
 # output directory
-ENV DIST_DIR=/tmp/nvidia-container-runtime-hook-$PKG_VERS
+ENV DIST_DIR=/tmp/nvidia-container-toolkit-$PKG_VERS
 RUN mkdir -p $DIST_DIR /dist
 
-# nvidia-container-runtime-hook
-COPY nvidia-container-runtime-hook/ $GOPATH/src/nvidia-container-runtime-hook
+# nvidia-container-toolkit
+COPY nvidia-container-toolkit/ $GOPATH/src/nvidia-container-toolkit
 
-RUN go get -ldflags "-s -w" -v nvidia-container-runtime-hook && \
-    mv $GOPATH/bin/nvidia-container-runtime-hook $DIST_DIR/nvidia-container-runtime-hook
+RUN go get -ldflags "-s -w" -v nvidia-container-toolkit && \
+    mv $GOPATH/bin/nvidia-container-toolkit $DIST_DIR/nvidia-container-toolkit
 
 COPY config.toml.debian $DIST_DIR/config.toml
 
@@ -34,4 +34,4 @@ RUN if [ "$REVISION" != "$(dpkg-parsechangelog --show-field=Version)" ]; then ex
 
 CMD export DISTRIB="unstable" && \
     debuild -eDISTRIB -eSECTION --dpkg-buildpackage-hook='sh debian/prepare' -i -us -uc -b && \
-    mv /tmp/nvidia-container-runtime-hook_*.deb /dist
+    mv /tmp/nvidia-container-toolkit_*.deb /dist

hook/Dockerfile.ubuntu → toolkit/Dockerfile.ubuntu

@@ -11,14 +11,14 @@ ENV REVISION "$PKG_VERS-$PKG_REV"
 ENV SECTION ""
 
 # output directory
-ENV DIST_DIR=/tmp/nvidia-container-runtime-hook-$PKG_VERS
+ENV DIST_DIR=/tmp/nvidia-container-toolkit-$PKG_VERS
 RUN mkdir -p $DIST_DIR /dist
 
-# nvidia-container-runtime-hook
-COPY nvidia-container-runtime-hook/ $GOPATH/src/nvidia-container-runtime-hook
+# nvidia-container-toolkit
+COPY nvidia-container-toolkit/ $GOPATH/src/nvidia-container-toolkit
 
-RUN go get -ldflags "-s -w" -v nvidia-container-runtime-hook && \
-    mv $GOPATH/bin/nvidia-container-runtime-hook $DIST_DIR/nvidia-container-runtime-hook
+RUN go get -ldflags "-s -w" -v nvidia-container-toolkit && \
+    mv $GOPATH/bin/nvidia-container-toolkit $DIST_DIR/nvidia-container-toolkit
 
 COPY config.toml.ubuntu $DIST_DIR/config.toml
 

hook/Makefile → toolkit/Makefile

@@ -2,25 +2,25 @@
 
 DOCKER ?= docker
 
-MKDIR  ?= mkdir
+MKDIR ?= mkdir
 
-VERSION := 1.4.0
+VERSION := 1.0.0
 
 DIST_DIR  := $(CURDIR)/../dist
 
 .NOTPARALLEL:
 .PHONY: all
 
-all: ubuntu18.04 ubuntu16.04 ubuntu14.04 debian9 debian8 centos7 amzn2 amzn1
+all: ubuntu18.04 ubuntu16.04 debian9 centos7 amzn2 amzn1
 
 ubuntu%: ARCH := amd64
 ubuntu%: $(CURDIR)/Dockerfile.ubuntu
 	$(DOCKER) build --build-arg VERSION_ID="$*" \
 	                --build-arg PKG_VERS="$(VERSION)" \
 	                --build-arg PKG_REV="1" \
-	                -t "nvidia/hook/ubuntu:$*" -f Dockerfile.ubuntu .
+	                -t "nvidia/toolkit/ubuntu:$*" -f Dockerfile.ubuntu .
 	$(MKDIR) -p $(DIST_DIR)/$@/$(ARCH)
-	$(DOCKER) run --cidfile $@.cid "nvidia/hook/ubuntu:$*"
+	$(DOCKER) run --cidfile $@.cid "nvidia/toolkit/ubuntu:$*"
 	$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/$@/$(ARCH)/
 	$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
 
@@ -29,9 +29,9 @@ debian%: $(CURDIR)/Dockerfile.debian
 	$(DOCKER) build --build-arg VERSION_ID="$*" \
 	                --build-arg PKG_VERS="$(VERSION)" \
 	                --build-arg PKG_REV="1" \
-	                -t "nvidia/hook/debian:$*" -f Dockerfile.debian .
+	                -t "nvidia/toolkit/debian:$*" -f Dockerfile.debian .
 	$(MKDIR) -p $(DIST_DIR)/$@/$(ARCH)
-	$(DOCKER) run --cidfile $@.cid "nvidia/hook/debian:$*"
+	$(DOCKER) run --cidfile $@.cid "nvidia/toolkit/debian:$*"
 	$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/$@/$(ARCH)/
 	$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
 
@@ -40,9 +40,9 @@ centos%: $(CURDIR)/Dockerfile.centos
 	$(DOCKER) build --build-arg VERSION_ID="$*" \
 	                --build-arg PKG_VERS="$(VERSION)" \
 	                --build-arg PKG_REV="2" \
-	                -t "nvidia/hook/centos:$*" -f Dockerfile.centos .
+	                -t "nvidia/toolkit/centos:$*" -f Dockerfile.centos .
 	$(MKDIR) -p $(DIST_DIR)/$@/$(ARCH)
-	$(DOCKER) run --cidfile $@.cid "nvidia/hook/centos:$*"
+	$(DOCKER) run --cidfile $@.cid "nvidia/toolkit/centos:$*"
 	$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/$@/$(ARCH)/
 	$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
 
@@ -51,8 +51,8 @@ amzn%: $(CURDIR)/Dockerfile.amzn
 	$(DOCKER) build --build-arg VERSION_ID="$*" \
 	                --build-arg PKG_VERS="$(VERSION)" \
 	                --build-arg PKG_REV="2.amzn$*" \
-	                -t "nvidia/hook/amzn:$*" -f Dockerfile.amzn .
+	                -t "nvidia/toolkit/amzn:$*" -f Dockerfile.amzn .
 	$(MKDIR) -p $(DIST_DIR)/$@/$(ARCH)
-	$(DOCKER) run --cidfile $@.cid "nvidia/hook/amzn:$*"
+	$(DOCKER) run --cidfile $@.cid "nvidia/toolkit/amzn:$*"
 	$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/$@/$(ARCH)/
 	$(DOCKER) rm $$(cat $@.cid) && rm $@.cid

hook/config.toml.amzn → toolkit/config.toml.amzn

@@ -5,7 +5,7 @@ disable-require = false
 #root = "/run/nvidia/driver"
 #path = "/usr/bin/nvidia-container-cli"
 environment = []
-#debug = "/var/log/nvidia-container-runtime-hook.log"
+#debug = "/var/log/nvidia-container-toolkit.log"
 #ldcache = "/etc/ld.so.cache"
 load-kmods = true
 #no-cgroups = false

hook/config.toml.centos → toolkit/config.toml.centos

@@ -5,7 +5,7 @@ disable-require = false
 #root = "/run/nvidia/driver"
 #path = "/usr/bin/nvidia-container-cli"
 environment = []
-#debug = "/var/log/nvidia-container-runtime-hook.log"
+#debug = "/var/log/nvidia-container-toolkit.log"
 #ldcache = "/etc/ld.so.cache"
 load-kmods = true
 #no-cgroups = false

hook/config.toml.debian → toolkit/config.toml.debian

@@ -5,7 +5,7 @@ disable-require = false
 #root = "/run/nvidia/driver"
 #path = "/usr/bin/nvidia-container-cli"
 environment = []
-#debug = "/var/log/nvidia-container-runtime-hook.log"
+#debug = "/var/log/nvidia-container-toolkit.log"
 #ldcache = "/etc/ld.so.cache"
 load-kmods = true
 #no-cgroups = false

hook/config.toml.ubuntu → toolkit/config.toml.ubuntu

@@ -5,7 +5,7 @@ disable-require = false
 #root = "/run/nvidia/driver"
 #path = "/usr/bin/nvidia-container-cli"
 environment = []
-#debug = "/var/log/nvidia-container-runtime-hook.log"
+#debug = "/var/log/nvidia-container-toolkit.log"
 #ldcache = "/etc/ld.so.cache"
 load-kmods = true
 #no-cgroups = false

toolkit/debian/changelog

+nvidia-container-toolkit (1.0.0-1) UNRELEASED; urgency=medium
+
+  * Initial release. Replaces older package nvidia-container-runtime-hook. (Closes: #XXXXXX)
+
+ -- Rajat Chopra <rajatc@nvidia.com>  Wed, 10 Jul 2019 11:31:11 -0700

hook/debian/control → toolkit/debian/control

-Source: nvidia-container-runtime-hook
+Source: nvidia-container-toolkit
 Section: @SECTION@utils
 Priority: optional
 Maintainer: NVIDIA CORPORATION <cudatools@nvidia.com>
@@ -8,7 +8,7 @@ Vcs-Git: https://github.com/NVIDIA/nvidia-container-runtime
 Vcs-Browser: https://github.com/NVIDIA/nvidia-container-runtime
 Build-Depends: debhelper (>= 9)
 
-Package: nvidia-container-runtime-hook
+Package: nvidia-container-toolkit
 Architecture: any
 Depends: ${misc:Depends}, libnvidia-container-tools (>= 0.1.0), libnvidia-container-tools (<< 2.0.0)
 Breaks: nvidia-container-runtime (<< 2.0.0)

hook/debian/copyright → toolkit/debian/copyright

 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: nvidia-container-runtime-hook
+Upstream-Name: nvidia-container-toolkit
 Source: https://github.com/NVIDIA/nvidia-container-runtime
 
 Files: *

hook/debian/nvidia-container-runtime-hook.install → toolkit/debian/nvidia-container-runtime-toolkit.install

 config.toml /etc/nvidia-container-runtime
-nvidia-container-runtime-hook /usr/bin
+nvidia-container-toolkit /usr/bin
\ No newline at end of file

hook/nvidia-container-runtime-hook/Godeps/Godeps.json → toolkit/nvidia-container-toolkit/Godeps/Godeps.json

 {
-	"ImportPath": "github.com/nvidia/nvidia-container-runtime/hook/nvidia-container-runtime-hook",
+	"ImportPath": "github.com/nvidia/nvidia-container-runtime/toolkit/nvidia-container-toolkit",
 	"GoVersion": "go1.9",
 	"GodepVersion": "v80",
 	"Deps": [

hook/oci-nvidia-hook → toolkit/oci-nvidia-hook

 #!/bin/sh
-PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" exec /usr/bin/nvidia-container-runtime-hook "$@"
+PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" exec /usr/bin/nvidia-container-toolkit "$@"

hook/oci-nvidia-hook.json → toolkit/oci-nvidia-hook.json

 {
     "version": "1.0.0",
     "hook": {
-        "path": "/usr/bin/nvidia-container-runtime-hook",
-        "args": ["nvidia-container-runtime-hook", "prestart"],
+        "path": "/usr/bin/nvidia-container-toolkit",
+        "args": ["nvidia-container-toolkit", "prestart"],
         "env": [
             "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
         ]

hook/rpm/SPECS/nvidia-container-runtime-hook.spec → toolkit/rpm/SPECS/nvidia-container-toolkit.spec

-Name: nvidia-container-runtime-hook
+Name: nvidia-container-toolkit
 Version: %{version}
 Release: %{release}
 Group: Development Tools
@@ -10,7 +10,7 @@ Summary: NVIDIA container runtime hook
 URL: https://github.com/NVIDIA/nvidia-container-runtime
 License: BSD
 
-Source0: nvidia-container-runtime-hook
+Source0: nvidia-container-toolkit
 Source1: config.toml
 Source2: oci-nvidia-hook
 Source3: oci-nvidia-hook.json
@@ -27,7 +27,7 @@ cp %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} .
 
 %install
 mkdir -p %{buildroot}%{_bindir}
-install -m 755 -t %{buildroot}%{_bindir} nvidia-container-runtime-hook
+install -m 755 -t %{buildroot}%{_bindir} nvidia-container-toolkit
 
 mkdir -p %{buildroot}/etc/nvidia-container-runtime
 install -m 644 -t %{buildroot}/etc/nvidia-container-runtime config.toml
@@ -40,7 +40,7 @@ install -m 644 -t %{buildroot}/usr/share/containers/oci/hooks.d oci-nvidia-hook.
 
 %files
 %license LICENSE
-%{_bindir}/nvidia-container-runtime-hook
+%{_bindir}/nvidia-container-toolkit
 /etc/nvidia-container-runtime/config.toml
 /usr/libexec/oci/hooks.d/oci-nvidia-hook
 /usr/share/containers/oci/hooks.d/oci-nvidia-hook.json