Merge pull request #1605 from ashahba:ashahba/maintainer

PiperOrigin-RevId: 319883321

Author: tensorflow-copybara

tensorflow_serving/tools/docker/Dockerfile.devel-mkl

@@ -16,7 +16,7 @@ FROM ubuntu:18.04 as base_build
 ARG TF_SERVING_VERSION_GIT_BRANCH=master
 ARG TF_SERVING_VERSION_GIT_COMMIT=head
 
-LABEL maintainer="Karthik Vadla <karthik.vadla@intel.com>"
+LABEL maintainer="Clayne Robison <clayne.b.robison@intel.com>"
 LABEL tensorflow_serving_github_branchtag=${TF_SERVING_VERSION_GIT_BRANCH}
 LABEL tensorflow_serving_github_commit=${TF_SERVING_VERSION_GIT_COMMIT}
 
@@ -47,6 +47,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
+RUN curl -fSsL -O https://bootstrap.pypa.io/get-pip.py && \
+    python3 get-pip.py && \
+    rm get-pip.py
+
 # Install python 3.6.
 RUN add-apt-repository ppa:deadsnakes/ppa && \
     apt-get update && apt-get install -y \
@@ -58,10 +62,6 @@ RUN add-apt-repository ppa:deadsnakes/ppa && \
 # Make python3.6 the default python version
 RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.6 0
 
-RUN curl -fSsL -O https://bootstrap.pypa.io/get-pip.py && \
-    python3 get-pip.py && \
-    rm get-pip.py
-
 RUN pip3 --no-cache-dir install \
     future>=0.17.1 \
     grpcio \
@@ -91,12 +91,11 @@ RUN git clone --branch=${TF_SERVING_VERSION_GIT_BRANCH} https://github.com/tenso
     git remote add upstream https://github.com/tensorflow/serving.git && \
     if [ "${TF_SERVING_VERSION_GIT_COMMIT}" != "head" ]; then git checkout ${TF_SERVING_VERSION_GIT_COMMIT} ; fi
 
-FROM base_build as binary_build
 
+FROM base_build as binary_build
 # Build, and install TensorFlow Serving
 ARG TF_SERVING_BUILD_OPTIONS="--config=mkl --config=release"
 RUN echo "Building with build options: ${TF_SERVING_BUILD_OPTIONS}"
-
 ARG TF_SERVING_BAZEL_OPTIONS=""
 RUN echo "Building with Bazel options: ${TF_SERVING_BAZEL_OPTIONS}"
 
@@ -118,7 +117,8 @@ RUN bazel build --color=yes --curses=yes \
     tensorflow_serving/tools/pip_package:build_pip_package && \
     bazel-bin/tensorflow_serving/tools/pip_package/build_pip_package \
     /tmp/pip && \
-    pip --no-cache-dir install --upgrade /tmp/pip/tensorflow_serving*.whl && \
+    pip --no-cache-dir install --upgrade \
+    /tmp/pip/tensorflow_serving_api-*.whl && \
     rm -rf /tmp/pip
 
 # Copy MKL libraries

tensorflow_serving/tools/docker/Dockerfile.mkl

@@ -21,7 +21,7 @@ FROM ubuntu:18.04
 ARG TF_SERVING_VERSION_GIT_BRANCH=master
 ARG TF_SERVING_VERSION_GIT_COMMIT=head
 
-LABEL maintainer="Karthik Vadla <karthik.vadla@intel.com>"
+LABEL maintainer="Clayne Robison <clayne.b.robison@intel.com>"
 LABEL tensorflow_serving_github_branchtag=${TF_SERVING_VERSION_GIT_BRANCH}
 LABEL tensorflow_serving_github_commit=${TF_SERVING_VERSION_GIT_COMMIT}
 
@@ -42,7 +42,6 @@ COPY --from=build_image /usr/local/lib/libmklml_intel.so /usr/local/lib
 ENV LIBRARY_PATH '/usr/local/lib:$LIBRARY_PATH'
 ENV LD_LIBRARY_PATH '/usr/local/lib:$LD_LIBRARY_PATH'
 
-
 # Expose ports
 # gRPC
 EXPOSE 8500
@@ -57,9 +56,6 @@ RUN mkdir -p ${MODEL_BASE_PATH}
 # The only required piece is the model name in order to differentiate endpoints
 ENV MODEL_NAME=model
 
-# Create a script that runs the model server so we can use environment variables
-# while also passing in arguments from the docker command line
-
 # Setting MKL environment variables can improve performance.
 # https://www.tensorflow.org/guide/performance/overview
 # Read about Tuning MKL for the best performance
@@ -97,6 +93,8 @@ ENV MKLDNN_VERBOSE=0
 ENV TENSORFLOW_INTRA_OP_PARALLELISM=2
 ENV TENSORFLOW_INTER_OP_PARALLELISM=2
 
+# Create a script that runs the model server so we can use environment variables
+# while also passing in arguments from the docker command line
 RUN echo '#!/bin/bash \n\n\
 tensorflow_model_server --port=8500 --rest_api_port=8501 \
 --tensorflow_intra_op_parallelism=${TENSORFLOW_INTRA_OP_PARALLELISM} \