Merge pull request #3685 from cpennington/cale/fix-pip-versions

Make sure we have pip and pip3 at the right version pointing to the r…

docker/build/go-agent/Dockerfile

@@ -47,18 +47,14 @@ RUN printf "\ngo      ALL=(ALL:ALL) NOPASSWD: /usr/bin/pip, /usr/local/bin/pip\n
 RUN printf "\ngo      ALL=(ALL:ALL) NOPASSWD: /usr/bin/pip3, /usr/local/bin/pip3\n" >> /etc/sudoers
 
 # Upgrade pip and setup tools. Needed for Ansible 2.x
-# Must upgrade to latest before pinning to work around bug
-# https://github.com/pypa/pip/issues/3862
 RUN \
-  pip3 install --upgrade pip && \
-  pip install --upgrade pip && \
+  pip install --upgrade pip==8.1.2 && \
+  pip3 install --upgrade pip==8.1.2 && \
   #pip may have moved from /usr/bin/ to /usr/local/bin/. This clears bash's path cache.
   hash -r && \
-  pip3 install --upgrade pip==8.1.2 && \
-  pip install --upgrade pip==8.1.2 && \
   # upgrade setuptools early to avoid no distribution errors
-  pip3 install --upgrade setuptools==24.0.3 && \
-  pip install --upgrade setuptools==24.0.3
+  pip install --upgrade setuptools==24.0.3 && \
+  pip3 install --upgrade setuptools==24.0.3
 
 
 # Install AWS command-line interface - for AWS operations in a go-agent task.