ci: updated base-image

This commit is contained in:
Marvin Zhang
2024-11-20 14:55:42 +08:00
parent 43b5e7e36a
commit b67e7f06d2
3 changed files with 5 additions and 13 deletions

View File

@@ -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)

View File

@@ -27,6 +27,7 @@ const (
DefaultNodeMaxRunners = 16
MetadataConfigDirName = ".crawlab"
MetadataConfigName = "config.json"
PyenvRoot = "/root/.pyenv"
)
func IsDev() bool {

View File

@@ -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