Merge branch '2.0'

Signed-off-by: Felix Abecassis <[email protected]>
beck-ganjatechs · Nov 14, 2017 · fe18749 · fe18749
2 parents 3c41879 + 7856177
commit fe18749
Show file tree

Hide file tree

Showing 75 changed files with 394 additions and 4,358 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,4 @@
 .\#*
 *~
 \#*
-bin
 dist
-samples
diff --git a/CLA b/CLA
diff --git a/Dockerfile.build b/Dockerfile.build
diff --git a/Dockerfile.build.ppc64le b/Dockerfile.build.ppc64le
diff --git a/Dockerfile.centos7 b/Dockerfile.centos7
@@ -0,0 +1,36 @@
+FROM centos:7
+
+# packaging dependencies
+RUN yum install -y \
+        rpm-build && \
+    rm -rf /var/cache/yum/*
+
+# packaging
+ARG PKG_VERS
+ARG PKG_REV
+ARG RUNTIME_VERSION
+ARG DOCKER_VERSION
+
+ENV VERSION $PKG_VERS
+ENV RELEASE $PKG_REV
+ENV RUNTIME_VERSION $RUNTIME_VERSION
+ENV DOCKER_VERSION $DOCKER_VERSION
+
+# output directory
+ENV DIST_DIR=/tmp/nvidia-container-runtime-$PKG_VERS/SOURCES
+RUN mkdir -p $DIST_DIR
+
+COPY nvidia-docker $DIST_DIR
+COPY daemon.json $DIST_DIR
+
+WORKDIR $DIST_DIR/..
+COPY rpm .
+
+CMD rpmbuild --clean -bb \
+             -D "_topdir $PWD" \
+             -D "version $VERSION" \
+             -D "release $RELEASE" \
+             -D "runtime_version $RUNTIME_VERSION" \
+             -D "docker_version $DOCKER_VERSION" \
+             SPECS/nvidia-docker2.spec && \
+    mv RPMS/noarch/*.rpm /dist
diff --git a/Dockerfile.deb b/Dockerfile.deb
diff --git a/Dockerfile.deb.ppc64le b/Dockerfile.deb.ppc64le
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,4 @@ @@
     .\#*
     *~
     \#*
-    bin
     dist
-    samples