From 53b280d05cf381c1b4f3547b8263c9adba6ece20 Mon Sep 17 00:00:00 2001 From: hzy46 <362583303@qq.com> Date: Mon, 8 Mar 2021 12:08:31 +0800 Subject: [PATCH 1/7] fix --- contrib/kubespray/script/environment.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/contrib/kubespray/script/environment.sh b/contrib/kubespray/script/environment.sh index b9a5544f22..0f06812c58 100644 --- a/contrib/kubespray/script/environment.sh +++ b/contrib/kubespray/script/environment.sh @@ -27,9 +27,11 @@ echo "Install necessray packages" echo "Install Python3 and pip" sudo apt-get -y update -sudo apt-get -y install software-properties-common python3 python3-dev -curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py -sudo python3 get-pip.py +sudo apt-get -y install software-properties-common python3 python3-dev python3-pip +# "apt-get install python3" will install python3.5 on Ubuntu 16.04 +# The lastest pip doesn't support python3.5. +# Here we use a fixed version number to ensure compatiblity. +sudo python3 -m pip install pip==20.3.4 echo "Install python packages" sudo python3 -m pip install paramiko # need paramiko for ansible-playbook From 86d883105d52342d890cf15c6a983744aa9cfe54 Mon Sep 17 00:00:00 2001 From: hzy46 <362583303@qq.com> Date: Mon, 8 Mar 2021 12:12:54 +0800 Subject: [PATCH 2/7] fix --- contrib/kubespray/script/environment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/kubespray/script/environment.sh b/contrib/kubespray/script/environment.sh index 0f06812c58..5ab5730fd7 100644 --- a/contrib/kubespray/script/environment.sh +++ b/contrib/kubespray/script/environment.sh @@ -30,7 +30,7 @@ sudo apt-get -y update sudo apt-get -y install software-properties-common python3 python3-dev python3-pip # "apt-get install python3" will install python3.5 on Ubuntu 16.04 # The lastest pip doesn't support python3.5. -# Here we use a fixed version number to ensure compatiblity. +# Here we use a fixed version number to ensure compatibility. sudo python3 -m pip install pip==20.3.4 echo "Install python packages" From 6d45c336989f0808a6306a9ac1b072023117f007 Mon Sep 17 00:00:00 2001 From: hzy46 <362583303@qq.com> Date: Mon, 8 Mar 2021 13:54:08 +0800 Subject: [PATCH 3/7] fix --- src/dev-box/build/dev-box.common.dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/src/dev-box/build/dev-box.common.dockerfile b/src/dev-box/build/dev-box.common.dockerfile index c4814c3b3f..01e7302874 100644 --- a/src/dev-box/build/dev-box.common.dockerfile +++ b/src/dev-box/build/dev-box.common.dockerfile @@ -44,6 +44,7 @@ RUN apt-get -y update && \ git clone https://github.com/Microsoft/pai.git &&\ pip install bcrypt==3.1.7 dnspython==1.16.0 python-etcd docker kubernetes==12.0.0 paramiko==2.6.0 cryptography==3.2 cachetools==3.1.1 GitPython==2.1.15 jsonschema attrs dicttoxml beautifulsoup4 future setuptools==44.1.0 &&\ python -m easy_install --upgrade pyOpenSSL && \ + python3 -m pip install pip==20.3.4 && \ pip3 install kubernetes==12.0.0 jinja2 WORKDIR /tmp From 080415661de852a73809aa52925d5ac6fc6c463c Mon Sep 17 00:00:00 2001 From: hzy46 <362583303@qq.com> Date: Mon, 8 Mar 2021 17:44:21 +0800 Subject: [PATCH 4/7] fix --- src/dev-box/build/dev-box.common.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dev-box/build/dev-box.common.dockerfile b/src/dev-box/build/dev-box.common.dockerfile index 01e7302874..249b954efe 100644 --- a/src/dev-box/build/dev-box.common.dockerfile +++ b/src/dev-box/build/dev-box.common.dockerfile @@ -44,7 +44,7 @@ RUN apt-get -y update && \ git clone https://github.com/Microsoft/pai.git &&\ pip install bcrypt==3.1.7 dnspython==1.16.0 python-etcd docker kubernetes==12.0.0 paramiko==2.6.0 cryptography==3.2 cachetools==3.1.1 GitPython==2.1.15 jsonschema attrs dicttoxml beautifulsoup4 future setuptools==44.1.0 &&\ python -m easy_install --upgrade pyOpenSSL && \ - python3 -m pip install pip==20.3.4 && \ + python3 -m pip3 install pip3==20.3.4 && \ pip3 install kubernetes==12.0.0 jinja2 WORKDIR /tmp From f91950130f834c2ef74fbfa36695eb38fad84e4e Mon Sep 17 00:00:00 2001 From: hzy46 <362583303@qq.com> Date: Tue, 9 Mar 2021 10:37:04 +0800 Subject: [PATCH 5/7] fix --- src/dev-box/build/dev-box.common.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dev-box/build/dev-box.common.dockerfile b/src/dev-box/build/dev-box.common.dockerfile index 249b954efe..62236ded90 100644 --- a/src/dev-box/build/dev-box.common.dockerfile +++ b/src/dev-box/build/dev-box.common.dockerfile @@ -44,7 +44,7 @@ RUN apt-get -y update && \ git clone https://github.com/Microsoft/pai.git &&\ pip install bcrypt==3.1.7 dnspython==1.16.0 python-etcd docker kubernetes==12.0.0 paramiko==2.6.0 cryptography==3.2 cachetools==3.1.1 GitPython==2.1.15 jsonschema attrs dicttoxml beautifulsoup4 future setuptools==44.1.0 &&\ python -m easy_install --upgrade pyOpenSSL && \ - python3 -m pip3 install pip3==20.3.4 && \ + pip3 install pip3==20.3.4 && \ pip3 install kubernetes==12.0.0 jinja2 WORKDIR /tmp From ab561fee8020b6525ea6a609f49763b4ddcf0fe4 Mon Sep 17 00:00:00 2001 From: hzy46 <362583303@qq.com> Date: Tue, 9 Mar 2021 11:41:17 +0800 Subject: [PATCH 6/7] fix --- src/dev-box/build/dev-box.common.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dev-box/build/dev-box.common.dockerfile b/src/dev-box/build/dev-box.common.dockerfile index 62236ded90..01c422f9d1 100644 --- a/src/dev-box/build/dev-box.common.dockerfile +++ b/src/dev-box/build/dev-box.common.dockerfile @@ -44,7 +44,7 @@ RUN apt-get -y update && \ git clone https://github.com/Microsoft/pai.git &&\ pip install bcrypt==3.1.7 dnspython==1.16.0 python-etcd docker kubernetes==12.0.0 paramiko==2.6.0 cryptography==3.2 cachetools==3.1.1 GitPython==2.1.15 jsonschema attrs dicttoxml beautifulsoup4 future setuptools==44.1.0 &&\ python -m easy_install --upgrade pyOpenSSL && \ - pip3 install pip3==20.3.4 && \ + pip3 install pip==20.3.4 && \ pip3 install kubernetes==12.0.0 jinja2 WORKDIR /tmp From d23ecea443c63a081cc667fea374801a3bece2a0 Mon Sep 17 00:00:00 2001 From: hzy46 <362583303@qq.com> Date: Tue, 9 Mar 2021 13:41:07 +0800 Subject: [PATCH 7/7] fix --- src/dev-box/build/dev-box.common.dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/src/dev-box/build/dev-box.common.dockerfile b/src/dev-box/build/dev-box.common.dockerfile index 01c422f9d1..c4814c3b3f 100644 --- a/src/dev-box/build/dev-box.common.dockerfile +++ b/src/dev-box/build/dev-box.common.dockerfile @@ -44,7 +44,6 @@ RUN apt-get -y update && \ git clone https://github.com/Microsoft/pai.git &&\ pip install bcrypt==3.1.7 dnspython==1.16.0 python-etcd docker kubernetes==12.0.0 paramiko==2.6.0 cryptography==3.2 cachetools==3.1.1 GitPython==2.1.15 jsonschema attrs dicttoxml beautifulsoup4 future setuptools==44.1.0 &&\ python -m easy_install --upgrade pyOpenSSL && \ - pip3 install pip==20.3.4 && \ pip3 install kubernetes==12.0.0 jinja2 WORKDIR /tmp