提交 7a4fabc4 编写于 作者: R Renaud Gaubert

Bump toolkit version 1.0.5 and runtime version 3.1.4

Signed-off-by: NRenaud Gaubert <rgaubert@nvidia.com>
上级 b76d6ecd
......@@ -15,9 +15,11 @@ RUN make
# packaging
ARG PKG_VERS
ARG PKG_REV
ARG TOOLKIT_VERSION
ENV VERSION $PKG_VERS
ENV RELEASE $PKG_REV
ENV TOOLKIT_VERSION $TOOLKIT_VERSION
# output directory
ENV DIST_DIR=/tmp/nvidia-container-runtime-$PKG_VERS/SOURCES
......@@ -33,5 +35,6 @@ CMD arch=$(uname -m) && \
-D "_topdir $PWD" \
-D "version $VERSION" \
-D "release $RELEASE" \
-D "toolkit_version $TOOLKIT_VERSION" \
SPECS/nvidia-container-runtime.spec && \
mv RPMS/$arch/*.rpm /dist
......@@ -15,9 +15,11 @@ RUN make
# packaging
ARG PKG_VERS
ARG PKG_REV
ARG TOOLKIT_VERSION
ENV VERSION $PKG_VERS
ENV RELEASE $PKG_REV
ENV TOOLKIT_VERSION $TOOLKIT_VERSION
# output directory
ENV DIST_DIR=/tmp/nvidia-container-runtime-$PKG_VERS/SOURCES
......@@ -33,5 +35,6 @@ CMD arch=$(uname -m) && \
-D "_topdir $PWD" \
-D "version $VERSION" \
-D "release $RELEASE" \
-D "toolkit_version $TOOLKIT_VERSION" \
SPECS/nvidia-container-runtime.spec && \
mv RPMS/$arch/*.rpm /dist
......@@ -18,10 +18,12 @@ RUN make
# packaging
ARG PKG_VERS
ARG PKG_REV
ARG TOOLKIT_VERSION
ENV DEBFULLNAME "NVIDIA CORPORATION"
ENV DEBEMAIL "cudatools@nvidia.com"
ENV REVISION "$PKG_VERS-$PKG_REV"
ENV TOOLKIT_VERSION $TOOLKIT_VERSION
ENV SECTION ""
# output directory
......@@ -34,6 +36,7 @@ WORKDIR $DIST_DIR
COPY debian ./debian
RUN sed -i "s;@VERSION@;${REVISION};" debian/changelog && \
sed -i "s;@TOOLKIT_VERSION@;${TOOLKIT_VERSION};" debian/control && \
if [ "$REVISION" != "$(dpkg-parsechangelog --show-field=Version)" ]; then exit 1; fi
CMD export DISTRIB="$(lsb_release -cs)" && \
......
......@@ -16,9 +16,11 @@ RUN make
# packaging
ARG PKG_VERS
ARG PKG_REV
ARG TOOLKIT_VERSION
ENV VERSION $PKG_VERS
ENV RELEASE $PKG_REV
ENV TOOLKIT_VERSION $TOOLKIT_VERSION
# output directory
ENV DIST_DIR=/tmp/nvidia-container-runtime-$PKG_VERS/SOURCES
......@@ -34,5 +36,6 @@ CMD arch=$(uname -m) && \
-D "_topdir $PWD" \
-D "version $VERSION" \
-D "release $RELEASE" \
-D "toolkit_version $TOOLKIT_VERSION" \
SPECS/nvidia-container-runtime.spec && \
mv RPMS/$arch/*.rpm /dist
......@@ -17,10 +17,12 @@ RUN make
# packaging
ARG PKG_VERS
ARG PKG_REV
ARG TOOLKIT_VERSION
ENV DEBFULLNAME "NVIDIA CORPORATION"
ENV DEBEMAIL "cudatools@nvidia.com"
ENV REVISION "$PKG_VERS-$PKG_REV"
ENV TOOLKIT_VERSION $TOOLKIT_VERSION
ENV SECTION ""
# output directory
......@@ -33,6 +35,7 @@ WORKDIR $DIST_DIR
COPY debian ./debian
RUN sed -i "s;@VERSION@;${REVISION};" debian/changelog && \
sed -i "s;@TOOLKIT_VERSION@;${TOOLKIT_VERSION};" debian/control && \
if [ "$REVISION" != "$(dpkg-parsechangelog --show-field=Version)" ]; then exit 1; fi
CMD export DISTRIB="$(lsb_release -cs)" && \
......
......@@ -3,9 +3,11 @@
DOCKER ?= docker
MKDIR ?= mkdir
VERSION := 3.1.3
VERSION := 3.1.4
PKG_REV := 1
TOOLKIT_VERSION := 1.0.5
DIST_DIR := $(CURDIR)/../dist
BASE := nvidia/base
......@@ -20,6 +22,7 @@ ubuntu%:
$(DOCKER) build --build-arg VERSION_ID="$*" \
--build-arg PKG_VERS="$(VERSION)" \
--build-arg PKG_REV="$(PKG_REV)" \
--build-arg TOOLKIT_VERSION="$(TOOLKIT_VERSION)" \
--build-arg BASE="$(BASE)" \
-t "nvidia/runtime/ubuntu:$*" -f Dockerfile.ubuntu .
$(MKDIR) -p "$(DIST_DIR)/ubuntu$*/$(ARCH)"
......@@ -32,6 +35,7 @@ debian%:
$(DOCKER) build --build-arg VERSION_ID="$*" \
--build-arg PKG_VERS="$(VERSION)" \
--build-arg PKG_REV="$(PKG_REV)" \
--build-arg TOOLKIT_VERSION="$(TOOLKIT_VERSION)" \
--build-arg BASE="$(BASE)" \
-t "nvidia/runtime/debian:$*" -f Dockerfile.debian .
$(MKDIR) -p "$(DIST_DIR)/debian$*/$(ARCH)"
......@@ -44,6 +48,7 @@ centos%:
$(DOCKER) build --build-arg VERSION_ID="$*" \
--build-arg PKG_VERS="$(VERSION)" \
--build-arg PKG_REV="$(PKG_REV)" \
--build-arg TOOLKIT_VERSION="$(TOOLKIT_VERSION)" \
--build-arg BASE="$(BASE)" \
-t "nvidia/runtime/centos:$*" -f Dockerfile.centos .
$(MKDIR) -p "$(DIST_DIR)/centos$*/$(ARCH)"
......@@ -56,6 +61,7 @@ amzn%:
$(DOCKER) build --build-arg VERSION_ID="$*" \
--build-arg PKG_VERS="$(VERSION)" \
--build-arg PKG_REV="$(PKG_REV)" \
--build-arg TOOLKIT_VERSION="$(TOOLKIT_VERSION)" \
--build-arg BASE="$(BASE)" \
-t "nvidia/runtime/amzn:$*" -f Dockerfile.amzn .
$(MKDIR) -p "$(DIST_DIR)/amzn$*/$(ARCH)"
......@@ -68,6 +74,7 @@ opensuse-leap%:
$(DOCKER) build --build-arg VERSION_ID="$*" \
--build-arg PKG_VERS="$(VERSION)" \
--build-arg PKG_REV="$(PKG_REV)" \
--build-arg TOOLKIT_VERSION="$(TOOLKIT_VERSION)" \
--build-arg BASE="$(BASE)" \
-t "nvidia/runtime/opensuse-leap:$*" -f Dockerfile.opensuse-leap .
$(MKDIR) -p $(DIST_DIR)/opensuse-leap$*/$(ARCH)
......
......@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9)
Package: nvidia-container-runtime
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, nvidia-container-toolkit (>= 1.0.2), nvidia-container-toolkit (<< 2.0.0), libseccomp2
Depends: ${shlibs:Depends}, ${misc:Depends}, nvidia-container-toolkit (>= @TOOLKIT_VERSION@), nvidia-container-toolkit (<< 2.0.0), libseccomp2
Description: NVIDIA container runtime
Provides a modified version of runc allowing users to run GPU enabled
containers.
......@@ -15,7 +15,7 @@ Source0: nvidia-container-runtime
Source1: LICENSE
Obsoletes: nvidia-container-runtime < 2.0.0
Requires: nvidia-container-toolkit >= 1.0.2, nvidia-container-toolkit < 2.0.0
Requires: nvidia-container-toolkit >= %{toolkit_version}, nvidia-container-toolkit < 2.0.0
%if 0%{?suse_version}
Requires: libseccomp2
......
......@@ -4,7 +4,7 @@ DOCKER ?= docker
MKDIR ?= mkdir
VERSION := 1.0.4
VERSION := 1.0.5
DIST_DIR := $(CURDIR)/../dist
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册