From 2203be98c394efb85e79575a21556e9536bec67b Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Wed, 20 Nov 2024 14:24:53 +0800 Subject: [PATCH] ci: updated base-image --- docker/base-image/install/python/python.sh | 29 ++++++++++++---------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/docker/base-image/install/python/python.sh b/docker/base-image/install/python/python.sh index 8ce8299f..d7c00c25 100644 --- a/docker/base-image/install/python/python.sh +++ b/docker/base-image/install/python/python.sh @@ -1,5 +1,7 @@ #!/bin/bash +version="3.10" + # install pyenv curl https://pyenv.run | bash @@ -9,34 +11,35 @@ echo 'command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/. echo 'eval "$(pyenv init -)"' >> ~/.bashrc source ~/.bashrc -# install python build dependencies -apt-get install -y make build-essential libssl-dev zlib1g-dev \ -libbz2-dev libreadline-dev libsqlite3-dev wget curl llvm \ -libncursesw5-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev +# install python ${version} via pyenv +pyenv install ${version} +pyenv global ${version} -# install python 3.10 via pyenv -pyenv install 3.10 -pyenv global 3.10 +# install python build dependencies +apt-get install -y \ + make build-essential libssl-dev zlib1g-dev \ + libbz2-dev libreadline-dev libsqlite3-dev wget curl llvm \ + libncursesw5-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev # alias rm /usr/local/bin/pip | true rm /usr/local/bin/python | true -ln -s /usr/local/bin/pip3.10 /usr/local/bin/pip -ln -s /usr/bin/python3.10 /usr/local/bin/python +ln -s /usr/local/bin/pip${version} /usr/local/bin/pip +ln -s /usr/bin/python${version} /usr/local/bin/python # verify python_version=$(python -V) -if [[ $python_version =~ "Python 3.10" ]]; then +if [[ $python_version =~ "Python ${version}" ]]; then : else - echo "ERROR: python version does not match. expect \"Python 3.10\", but actual is \"${python_version}\"" + echo "ERROR: python version does not match. expect \"Python ${version}\", but actual is \"${python_version}\"" exit 1 fi pip_version=$(pip -V) -if [[ $pip_version =~ "python 3.10" ]]; then +if [[ $pip_version =~ "python ${version}" ]]; then : else - echo "ERROR: pip version does not match. expected: \"python 3.10\", but actual is \"${pip_version}\"" + echo "ERROR: pip version does not match. expected: \"python ${version}\", but actual is \"${pip_version}\"" exit 1 fi