Merge pull request #1977 from rtg0795/cp_r2.5_20220208_170449

Fix the bug running get-pip.py on python3.6.

Author: rtg0795

tensorflow_serving/tools/docker/Dockerfile.devel

@@ -47,10 +47,6 @@ 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.7.
 RUN add-apt-repository ppa:deadsnakes/ppa && \
     apt-get update && apt-get install -y \
@@ -62,6 +58,10 @@ RUN add-apt-repository ppa:deadsnakes/ppa && \
 # Make python3.7 the default python version
 RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.7 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 \

tensorflow_serving/tools/docker/Dockerfile.devel-mkl

@@ -47,10 +47,6 @@ 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.7.
 RUN add-apt-repository ppa:deadsnakes/ppa && \
     apt-get update && apt-get install -y \
@@ -62,6 +58,10 @@ RUN add-apt-repository ppa:deadsnakes/ppa && \
 # Make python3.7 the default python version
 RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.7 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 \