Merge pull request #981 from netfs/r1.8

Dockerfile fixes from master

Author: netfs

tensorflow_serving/tools/docker/Dockerfile.devel

@@ -13,7 +13,12 @@
 # limitations under the License.
 FROM ubuntu:16.04
 
+ARG TF_SERVING_VERSION_GIT_BRANCH=1.8.0
+ARG TF_SERVING_VERSION_GIT_COMMIT=head
+
 LABEL [email protected]
+LABEL tensorflow_serving_github_branchtag=${TF_SERVING_VERSION_GIT_BRANCH}
+LABEL tensorflow_serving_github_commit=${TF_SERVING_VERSION_GIT_COMMIT}
 
 RUN apt-get update && apt-get install -y \
         automake \
@@ -67,12 +72,12 @@ RUN mkdir /bazel && \
     cd / && \
     rm -f /bazel/bazel-$BAZEL_VERSION-installer-linux-x86_64.sh
 
-# Download, build, and install TensorFlow Serving
-ARG TF_SERVING_VERSION_GIT_BRANCH=1.8.0
+# Download TF Serving sources (optionally at specific commit).
 WORKDIR /tensorflow-serving
-RUN git clone --depth=1 --branch=${TF_SERVING_VERSION_GIT_BRANCH} \
-        https://github.com/tensorflow/serving .
+RUN git clone --depth=1 --branch=${TF_SERVING_VERSION_GIT_BRANCH} https://github.com/tensorflow/serving .
+RUN if [ "${TF_SERVING_VERSION_GIT_COMMIT}" != "head" ]; then git checkout ${TF_SERVING_VERSION_GIT_COMMIT} ; fi
 
+# Build, and install TensorFlow Serving
 ARG TF_SERVING_BUILD_OPTIONS="--copt=-mavx --cxxopt=-D_GLIBCXX_USE_CXX11_ABI=0 --verbose_failures"
 RUN bazel build -c opt --color=yes --curses=yes ${TF_SERVING_BUILD_OPTIONS} \
     --output_filter=DONT_MATCH_ANYTHING \

tensorflow_serving/tools/docker/Dockerfile.devel-gpu

@@ -13,7 +13,12 @@
 # limitations under the License.
 FROM nvidia/cuda:9.0-cudnn7-devel-ubuntu16.04
 
+ARG TF_SERVING_VERSION_GIT_BRANCH=1.8.0
+ARG TF_SERVING_VERSION_GIT_COMMIT=head
+
 LABEL [email protected]
+LABEL tensorflow_serving_github_branchtag=${TF_SERVING_VERSION_GIT_BRANCH}
+LABEL tensorflow_serving_github_commit=${TF_SERVING_VERSION_GIT_COMMIT}
 
 # Install NCCL
 ENV NCCL_VERSION=2.2.12-1+cuda9.0
@@ -104,22 +109,21 @@ RUN mkdir -p ${NCCL_INSTALL_PATH} && \
   ln -s /usr/lib/x86_64-linux-gnu/libnccl.so.2 ${NCCL_INSTALL_PATH}lib/libnccl.so.2 && \
   ln -s /usr/lib/x86_64-linux-gnu/libnccl.so.$TF_NCCL_VERSION ${NCCL_INSTALL_PATH}lib/libnccl.so.$TF_NCCL_VERSION
 
-# Download, build, and install TensorFlow Serving
-ARG TF_SERVING_VERSION_GIT_BRANCH=1.8.0
+RUN ln -s /usr/local/cuda/lib64/stubs/libcuda.so /usr/local/cuda/lib64/stubs/libcuda.so.1
+ENV LD_LIBRARY_PATH=/usr/local/cuda/lib64/stubs:${LD_LIBRARY_PATH}
+
+# Download TF Serving sources (optionally at specific commit).
 WORKDIR /tensorflow-serving
-RUN git clone --depth=1 --branch=${TF_SERVING_VERSION_GIT_BRANCH} \
-        https://github.com/tensorflow/serving .
+RUN git clone --depth=1 --branch=${TF_SERVING_VERSION_GIT_BRANCH} https://github.com/tensorflow/serving .
+RUN if [ "${TF_SERVING_VERSION_GIT_COMMIT}" != "head" ]; then git checkout ${TF_SERVING_VERSION_GIT_COMMIT} ; fi
 
+# Build, and install TensorFlow Serving
 ARG TF_SERVING_BUILD_OPTIONS="--copt=-mavx --cxxopt=-D_GLIBCXX_USE_CXX11_ABI=0 --verbose_failures"
-RUN ln -s /usr/local/cuda/lib64/stubs/libcuda.so /usr/local/cuda/lib64/stubs/libcuda.so.1 && \
-    LD_LIBRARY_PATH=/usr/local/cuda/lib64/stubs:${LD_LIBRARY_PATH} \
-    bazel build -c opt --color=yes --curses=yes --config=cuda \
+RUN bazel build -c opt --color=yes --curses=yes --config=cuda \
     --output_filter=DONT_MATCH_ANYTHING \
-    --crosstool_top=@local_config_cuda//crosstool:toolchain \
     ${TF_SERVING_BUILD_OPTIONS} \
     tensorflow_serving/model_servers:tensorflow_model_server && \
     cp bazel-bin/tensorflow_serving/model_servers/tensorflow_model_server /usr/local/bin/ && \
-    rm /usr/local/cuda/lib64/stubs/libcuda.so.1 && \
     bazel clean --expunge --color=yes
 # Clean up Bazel cache when done.
 

tools/bazel.rc

@@ -1,4 +1,4 @@
-build:cuda --crosstool_top=@org_tensorflow//third_party/gpus/crosstool
+build:cuda --crosstool_top=@local_config_cuda//crosstool:toolchain
 build:cuda --define=using_cuda=true --define=using_cuda_nvcc=true
 
 build --action_env PYTHON_BIN_PATH="/usr/bin/python"