commit 5bf67466b3981c3cdf3d2c03fa77b04359e73a45
author Arthur She <arthur.she@linaro.org> Thu Mar 11 22:59:11 2021 -0800
committer Fathi Boudra <fathi.boudra@linaro.org> Fri Mar 12 08:31:30 2021 +0100
tree 4f8143401072fafea5a4a907e8b09d90b25a1ee4
parent 4f84a9f719690379d85e853ac1575f8e7bfc765d

Update the URL of script 'get-pip.py'

The URL of script 'get-pip.py' has changed.[1]

[1] https://ci.trustedfirmware.org/job/ci-dockerfiles-sanity-check/label=build-amd64/lastBuild/console

Signed-off-by: Arthur She <arthur.she@linaro.org>
Change-Id: I9a958719895243e9845308dbc57777790b8f6cb3

bionic-amd64-hafnium/Dockerfile

diff --git a/bionic-amd64-hafnium/Dockerfile b/bionic-amd64-hafnium/Dockerfile
index c4027ad..23317a7 100644
--- a/bionic-amd64-hafnium/Dockerfile
+++ b/bionic-amd64-hafnium/Dockerfile
@@ -35,7 +35,7 @@
     apt update -q=2 ;\
     apt install -q=2 --yes --no-install-recommends ${PKG_DEPS} ;\
     # Install Python requirements
-    curl -s https://bootstrap.pypa.io/3.5/get-pip.py -o /tmp/get-pip.py ;\
+    curl -s https://bootstrap.pypa.io/pip/3.5/get-pip.py -o /tmp/get-pip.py ;\
     python3 /tmp/get-pip.py ;\
     pip3 install --no-cache-dir fdt==0.3.0 ;\
     # Set Python 3 as default

bionic-amd64-tf-a-build/Dockerfile

diff --git a/bionic-amd64-tf-a-build/Dockerfile b/bionic-amd64-tf-a-build/Dockerfile
index af6419c..23bbd85 100644
--- a/bionic-amd64-tf-a-build/Dockerfile
+++ b/bionic-amd64-tf-a-build/Dockerfile
@@ -67,7 +67,7 @@
     apt update -q=2 ;\
     apt install -q=2 --yes --no-install-recommends git-lfs ;\
     # Install Python requirements
-    curl -s https://bootstrap.pypa.io/3.5/get-pip.py -o /tmp/get-pip.py ;\
+    curl -s https://bootstrap.pypa.io/pip/3.5/get-pip.py -o /tmp/get-pip.py ;\
     python2 /tmp/get-pip.py ;\
     pip2 install --no-cache-dir -r /opt/requirements_python2.txt ;\
     python3 /tmp/get-pip.py ;\

bionic-amd64-tf-m-build/Dockerfile

diff --git a/bionic-amd64-tf-m-build/Dockerfile b/bionic-amd64-tf-m-build/Dockerfile
index 7afc57c..486241f 100644
--- a/bionic-amd64-tf-m-build/Dockerfile
+++ b/bionic-amd64-tf-m-build/Dockerfile
@@ -65,7 +65,7 @@
     apt update -q=2 ;\
     apt install -q=2 --yes --no-install-recommends git-lfs ;\
     # Install Python requirements
-    curl -s https://bootstrap.pypa.io/3.5/get-pip.py -o /tmp/get-pip.py ;\
+    curl -s https://bootstrap.pypa.io/pip/3.5/get-pip.py -o /tmp/get-pip.py ;\
     python2 /tmp/get-pip.py ;\
     pip2 install --no-cache-dir -r /opt/requirements_python2.txt ;\
     python3 /tmp/get-pip.py ;\

jessie-amd64-jenkins-master/Dockerfile

diff --git a/jessie-amd64-jenkins-master/Dockerfile b/jessie-amd64-jenkins-master/Dockerfile
index c3dba3e..ced547b 100644
--- a/jessie-amd64-jenkins-master/Dockerfile
+++ b/jessie-amd64-jenkins-master/Dockerfile
@@ -7,7 +7,7 @@
 # Install jenkins job builder
 # Create plugins directory, symlinked on host machine
 USER root
-RUN wget -q https://bootstrap.pypa.io/3.5/get-pip.py -O /tmp/get-pip.py \
+RUN wget -q https://bootstrap.pypa.io/pip/3.5/get-pip.py -O /tmp/get-pip.py \
   && python /tmp/get-pip.py \
   && rm -f /tmp/get-pip.py \
   && pip install jenkins-job-builder==2.10.0 pyyaml==5.1 jinja2==2.10.1 python-jenkins==1.4.0 \