From 20171e5b4ee98ad50d47fd1386978284ab0fdf2c Mon Sep 17 00:00:00 2001 From: David Goodwin Date: Thu, 29 Nov 2018 12:42:29 -0800 Subject: [PATCH] Use dockerfile ARGS for TRTIS versions --- Dockerfile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2e28f14c1e..ff42f64f4a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -94,6 +94,8 @@ RUN bash -c 'if [ "$BUILD_CLIENTS_ONLY" != "1" ]; then \ ############################################################################ FROM ${TENSORFLOW_IMAGE} AS trtserver_build +ARG TRTIS_VERSION=0.10.0dev +ARG TRTIS_CONTAINER_VERSION=19.01dev ARG PYVER=3.5 ARG BUILD_CLIENTS_ONLY=0 @@ -211,8 +213,8 @@ RUN (cd /opt/tensorflow && ./nvbuild.sh --python$PYVER --configonly) && \ rm -rf /root/.cache/bazel && \ rm -rf /tmp/* -ENV TENSORRT_SERVER_VERSION 0.10.0dev -ENV NVIDIA_TENSORRT_SERVER_VERSION 19.01dev +ENV TENSORRT_SERVER_VERSION ${TRTIS_VERSION} +ENV NVIDIA_TENSORRT_SERVER_VERSION ${TRTIS_CONTAINER_VERSION} ENV PYVER ${PYVER} COPY nvidia_entrypoint.sh /opt/tensorrtserver @@ -223,11 +225,13 @@ ENTRYPOINT ["/opt/tensorrtserver/nvidia_entrypoint.sh"] ############################################################################ FROM ${BASE_IMAGE} +ARG TRTIS_VERSION=0.10.0dev +ARG TRTIS_CONTAINER_VERSION=19.01dev ARG PYVER=3.5 -ENV TENSORRT_SERVER_VERSION 0.10.0dev +ENV TENSORRT_SERVER_VERSION ${TRTIS_VERSION} +ENV NVIDIA_TENSORRT_SERVER_VERSION ${TRTIS_CONTAINER_VERSION} LABEL com.nvidia.tensorrtserver.version="${TENSORRT_SERVER_VERSION}" -ENV NVIDIA_TENSORRT_SERVER_VERSION 19.01dev ENV LD_LIBRARY_PATH /opt/tensorrtserver/lib:${LD_LIBRARY_PATH} ENV PATH /opt/tensorrtserver/bin:${PATH}