From 46100ebaf51aa1db9e0a825989a39ea056109287 Mon Sep 17 00:00:00 2001
From: Marvin Zhang <tikazyq@163.com>
Date: Wed, 20 Nov 2024 14:55:42 +0800
Subject: [PATCH] ci: updated base-image

---
 core/task/handler/runner.go                |  5 ++++-
 core/utils/config.go                       |  1 +
 docker/base-image/install/python/python.sh | 12 ------------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/core/task/handler/runner.go b/core/task/handler/runner.go
index 9de92dc7..ffe7d621 100644
--- a/core/task/handler/runner.go
+++ b/core/task/handler/runner.go
@@ -296,9 +296,12 @@ func (r *Runner) configureEnv() {
 	_ = os.Setenv("NODE_PATH", nodePath)
 
 	// Default envs
-	r.cmd.Env = append(os.Environ(), "CRAWLAB_TASK_ID="+r.tid.Hex())
+	r.cmd.Env = os.Environ()
+	r.cmd.Env = append(r.cmd.Env, "CRAWLAB_TASK_ID="+r.tid.Hex())
 	r.cmd.Env = append(r.cmd.Env, "CRAWLAB_GRPC_ADDRESS="+utils.GetGrpcAddress())
 	r.cmd.Env = append(r.cmd.Env, "CRAWLAB_GRPC_AUTH_KEY="+utils.GetAuthKey())
+	r.cmd.Env = append(r.cmd.Env, "PYENV_ROOT="+utils.PyenvRoot)
+	r.cmd.Env = append(r.cmd.Env, "PATH="+os.Getenv("PATH")+":"+utils.PyenvRoot+"/shims:"+utils.PyenvRoot+"/bin")
 
 	// Global environment variables
 	envs, err := client.NewModelService[models.Environment]().GetMany(nil, nil)
diff --git a/core/utils/config.go b/core/utils/config.go
index 018d3bb1..3f1b0268 100644
--- a/core/utils/config.go
+++ b/core/utils/config.go
@@ -27,6 +27,7 @@ const (
 	DefaultNodeMaxRunners      = 16
 	MetadataConfigDirName      = ".crawlab"
 	MetadataConfigName         = "config.json"
+	PyenvRoot                  = "/root/.pyenv"
 )
 
 func IsDev() bool {
diff --git a/docker/base-image/install/python/python.sh b/docker/base-image/install/python/python.sh
index 31eb9643..9e92d920 100644
--- a/docker/base-image/install/python/python.sh
+++ b/docker/base-image/install/python/python.sh
@@ -21,18 +21,6 @@ eval "$(pyenv virtualenv-init -)"
 pyenv install ${version}
 pyenv global ${version}
 
-# 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/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 ${version}" ]]; then