From 1564c9613c2baf478ced3341264ee0f4828f62c7 Mon Sep 17 00:00:00 2001 From: Keming Date: Wed, 8 Jan 2025 23:05:10 +0800 Subject: [PATCH 1/3] feat: upgrade to ubuntu 22.04 Signed-off-by: Keming --- .github/workflows/release.yml | 2 +- README.md | 6 +++--- base-images/build.sh | 2 +- base-images/julia1.8rc1-ubuntu20.04.Dockerfile | 2 +- base-images/remote-cache/build.envd | 8 ++++---- e2e/v0/cli/testdata/build-test/build.envd | 2 +- e2e/v0/cli/testdata/quick-start/build.envd | 2 +- e2e/v0/cli/testdata/up-test/build.envd | 2 +- e2e/v0/docs/testdata/complex/build.envd | 2 +- e2e/v0/docs/testdata/envdlib/build.envd | 2 +- e2e/v0/docs/testdata/getting_started/build.envd | 2 +- e2e/v0/docs/testdata/jupyter/build.envd | 2 +- e2e/v0/docs/testdata/minimal/build.envd | 2 +- e2e/v0/language/testdata/python/conda/build.envd | 2 +- e2e/v0/language/testdata/python/conda_channel/build.envd | 2 +- e2e/v0/language/testdata/run/build.envd | 2 +- e2e/v0/language/testdata/runtime/build.envd | 2 +- envd/api/v0/__init__.py | 4 ++-- envd/api/v0/config.py | 2 +- envd/api/v1/__init__.py | 4 ++-- envd/api/v1/config.py | 2 +- envd/api/v1/install.py | 2 +- examples/conda/build.envd | 2 +- examples/dgl/build.envd | 8 ++++---- examples/download_files/build.envd | 2 +- examples/dpgen2/build.envd | 2 +- examples/ianvs/build.envd | 2 +- examples/include_pkg/build.envd | 2 +- examples/julia-basic/build.envd | 2 +- examples/llm-inference/build.envd | 2 +- examples/mnist/build.envd | 2 +- examples/python-basic/build.envd | 2 +- examples/pytorch-profiler/build.envd | 2 +- examples/r-basic/build.envd | 2 +- examples/stable-diffusion/build.envd | 2 +- examples/streamlit-hello/build.envd | 2 +- examples/streamlit-mnist/build.envd | 4 ++-- pkg/app/interactive.go | 2 +- pkg/app/template/julia.envd | 4 ++-- pkg/app/template/r.envd | 4 ++-- pkg/lang/frontend/starlark/v0/testdata/test.envd | 2 +- pkg/lang/ir/v0/consts.go | 2 +- pkg/lang/ir/v0/system.go | 2 +- pkg/lang/ir/v1/consts.go | 2 +- pkg/types/envd.go | 2 +- 45 files changed, 58 insertions(+), 58 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0a4982bfa..338a908d8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -47,7 +47,7 @@ jobs: timeout-minutes: 20 strategy: matrix: - os: [macos-11, ubuntu-20.04] + os: [macos-11, ubuntu-22.04] steps: - uses: actions/checkout@v4 - name: Get gobin diff --git a/README.md b/README.md index 4d6b0151c..ef7fcdd4e 100644 --- a/README.md +++ b/README.md @@ -92,7 +92,7 @@ Forget copy-pasting Dockerfile instructions - use envd to easily build functions envdlib = include("https://github.com/tensorchord/envdlib") def build(): - base(os="ubuntu20.04", language="python") + base(os="ubuntu22.04", language="python") envdlib.tensorboard(host_port=8888) ``` @@ -176,7 +176,7 @@ The build manifest `build.envd` looks like: ```python title=build.envd def build(): - base(os="ubuntu20.04", language="python3") + base(os="ubuntu22.04", language="python3") # Configure the pip index if needed. # config.pip_index(url = "https://pypi.tuna.tsinghua.edu.cn/simple") install.python_packages(name = [ @@ -227,7 +227,7 @@ Please edit the `build.envd` to enable jupyter notebook: ```python title=build.envd def build(): - base(os="ubuntu20.04", language="python3") + base(os="ubuntu22.04", language="python3") # Configure the pip index if needed. # config.pip_index(url = "https://pypi.tuna.tsinghua.edu.cn/simple") install.python_packages(name = [ diff --git a/base-images/build.sh b/base-images/build.sh index 8360039d2..95d562c5d 100755 --- a/base-images/build.sh +++ b/base-images/build.sh @@ -20,7 +20,7 @@ ROOT_DIR=`dirname $0` GIT_TAG_VERSION=$(git describe --tags --abbrev=0) DOCKER_HUB_ORG="${DOCKER_HUB_ORG:-tensorchord}" -ENVD_OS="${ENVD_OS:-ubuntu20.04}" +ENVD_OS="${ENVD_OS:-ubuntu22.04}" JULIA_VERSION="${JULIA_VERSION:-1.8rc1}" RLANG_VERSION="${RLANG_VERSION:-4.2}" diff --git a/base-images/julia1.8rc1-ubuntu20.04.Dockerfile b/base-images/julia1.8rc1-ubuntu20.04.Dockerfile index 0cdd309e5..64b49edc1 100644 --- a/base-images/julia1.8rc1-ubuntu20.04.Dockerfile +++ b/base-images/julia1.8rc1-ubuntu20.04.Dockerfile @@ -1,6 +1,6 @@ ARG ENVD_VERSION ARG ENVD_SSHD_IMAGE -FROM ubuntu:20.04 as base +FROM ubuntu:22.04 as base FROM base as base-amd64 diff --git a/base-images/remote-cache/build.envd b/base-images/remote-cache/build.envd index 43591d86a..3eeb2a827 100644 --- a/base-images/remote-cache/build.envd +++ b/base-images/remote-cache/build.envd @@ -1,20 +1,20 @@ def build(): - base(os="ubuntu20.04", language="python3") + base(os="ubuntu22.04", language="python3") def build_gpu_11_2(): """tensorflow""" - base(os="ubuntu20.04", language="python3") + base(os="ubuntu22.04", language="python3") install.cuda(version="11.2.2", cudnn="8") def build_gpu_11_3(): """pytorch""" - base(os="ubuntu20.04", language="python3") + base(os="ubuntu22.04", language="python3") install.cuda(version="11.3.1", cudnn="8") def build_gpu_11_6(): """pytorch""" - base(os="ubuntu20.04", language="python3") + base(os="ubuntu22.04", language="python3") install.cuda(version="11.6.2", cudnn="8") diff --git a/e2e/v0/cli/testdata/build-test/build.envd b/e2e/v0/cli/testdata/build-test/build.envd index 3b22de80e..f7e0f9976 100644 --- a/e2e/v0/cli/testdata/build-test/build.envd +++ b/e2e/v0/cli/testdata/build-test/build.envd @@ -1,2 +1,2 @@ def build(): - base(os="ubuntu20.04", language="python3") + base(os="ubuntu22.04", language="python3") diff --git a/e2e/v0/cli/testdata/quick-start/build.envd b/e2e/v0/cli/testdata/quick-start/build.envd index 9c0e3cb02..33bee60f7 100644 --- a/e2e/v0/cli/testdata/quick-start/build.envd +++ b/e2e/v0/cli/testdata/quick-start/build.envd @@ -1,5 +1,5 @@ def build(): - base(os="ubuntu20.04", language="python3") + base(os="ubuntu22.04", language="python3") install.python_packages( name=[ "numpy", diff --git a/e2e/v0/cli/testdata/up-test/build.envd b/e2e/v0/cli/testdata/up-test/build.envd index a71119306..9e49d82cc 100644 --- a/e2e/v0/cli/testdata/up-test/build.envd +++ b/e2e/v0/cli/testdata/up-test/build.envd @@ -1,5 +1,5 @@ def build(): - base(os="ubuntu20.04", language="python3") + base(os="ubuntu22.04", language="python3") install.python_packages( name=[ "via", diff --git a/e2e/v0/docs/testdata/complex/build.envd b/e2e/v0/docs/testdata/complex/build.envd index 99dbeb9ad..8276ff5d9 100644 --- a/e2e/v0/docs/testdata/complex/build.envd +++ b/e2e/v0/docs/testdata/complex/build.envd @@ -18,7 +18,7 @@ deb https://mirror.sjtu.edu.cn/ubuntu focal-security main restricted universe mu "ms-python.python", ] ) - base(os="ubuntu20.04", language="python3") + base(os="ubuntu22.04", language="python3") install.python_packages( name=[ "numpy", diff --git a/e2e/v0/docs/testdata/envdlib/build.envd b/e2e/v0/docs/testdata/envdlib/build.envd index cd5b98c37..9fde95413 100644 --- a/e2e/v0/docs/testdata/envdlib/build.envd +++ b/e2e/v0/docs/testdata/envdlib/build.envd @@ -2,5 +2,5 @@ envdlib = include("https://github.com/tensorchord/envdlib") def build(): - base(os="ubuntu20.04", language="python") + base(os="ubuntu22.04", language="python") envdlib.tensorboard(host_port=8888) diff --git a/e2e/v0/docs/testdata/getting_started/build.envd b/e2e/v0/docs/testdata/getting_started/build.envd index 4c7cbf7c3..aca0159b3 100644 --- a/e2e/v0/docs/testdata/getting_started/build.envd +++ b/e2e/v0/docs/testdata/getting_started/build.envd @@ -1,5 +1,5 @@ def build(): - base(os="ubuntu20.04", language="python3") + base(os="ubuntu22.04", language="python3") # Configure pip index if needed. # config.pip_index(url = "https://pypi.tuna.tsinghua.edu.cn/simple") install.python_packages( diff --git a/e2e/v0/docs/testdata/jupyter/build.envd b/e2e/v0/docs/testdata/jupyter/build.envd index 3f3da5fa6..64173f743 100644 --- a/e2e/v0/docs/testdata/jupyter/build.envd +++ b/e2e/v0/docs/testdata/jupyter/build.envd @@ -1,5 +1,5 @@ def build(): - base(os="ubuntu20.04", language="python3") + base(os="ubuntu22.04", language="python3") install.python_packages( name=[ "numpy", diff --git a/e2e/v0/docs/testdata/minimal/build.envd b/e2e/v0/docs/testdata/minimal/build.envd index 26742cd5a..5b80aa65a 100644 --- a/e2e/v0/docs/testdata/minimal/build.envd +++ b/e2e/v0/docs/testdata/minimal/build.envd @@ -1,5 +1,5 @@ def build(): - base(os="ubuntu20.04", language="python3") + base(os="ubuntu22.04", language="python3") install.python_packages( name=[ "via", diff --git a/e2e/v0/language/testdata/python/conda/build.envd b/e2e/v0/language/testdata/python/conda/build.envd index acfeb96a0..fda006c00 100644 --- a/e2e/v0/language/testdata/python/conda/build.envd +++ b/e2e/v0/language/testdata/python/conda/build.envd @@ -1,3 +1,3 @@ def build(): install.conda_packages(env_file="env.yaml") - base(os="ubuntu20.04", language="python3.8") + base(os="ubuntu22.04", language="python3.8") diff --git a/e2e/v0/language/testdata/python/conda_channel/build.envd b/e2e/v0/language/testdata/python/conda_channel/build.envd index 46853559a..afb187906 100644 --- a/e2e/v0/language/testdata/python/conda_channel/build.envd +++ b/e2e/v0/language/testdata/python/conda_channel/build.envd @@ -7,4 +7,4 @@ channels: """ ) install.conda_packages(env_file="env.yaml") - base(os="ubuntu20.04", language="python3.8") + base(os="ubuntu22.04", language="python3.8") diff --git a/e2e/v0/language/testdata/run/build.envd b/e2e/v0/language/testdata/run/build.envd index 9ae7fa689..3c642f50c 100644 --- a/e2e/v0/language/testdata/run/build.envd +++ b/e2e/v0/language/testdata/run/build.envd @@ -1,5 +1,5 @@ def build(): - base(os="ubuntu20.04", language="python3") + base(os="ubuntu22.04", language="python3") shell("zsh") run( commands=[ diff --git a/e2e/v0/language/testdata/runtime/build.envd b/e2e/v0/language/testdata/runtime/build.envd index 1d2f67340..869559546 100644 --- a/e2e/v0/language/testdata/runtime/build.envd +++ b/e2e/v0/language/testdata/runtime/build.envd @@ -1,5 +1,5 @@ def build(): - base(os="ubuntu20.04", language="python3") + base(os="ubuntu22.04", language="python3") install.python_packages( name=[ "numpy", diff --git a/envd/api/v0/__init__.py b/envd/api/v0/__init__.py index 0f53c3408..2b9b11baa 100644 --- a/envd/api/v0/__init__.py +++ b/envd/api/v0/__init__.py @@ -28,7 +28,7 @@ def base(os: str, language: str, image: Optional[str]): """Set base image Args: - os (str): The operating system (i.e. `ubuntu20.04`) + os (str): The operating system (i.e. `ubuntu22.04`) language (str): The programming language dependency (i.e. `python3.8`) image (Optional[str]): Custom image (i.e. `python:3.9-slim`) """ @@ -90,7 +90,7 @@ def include(git: str): envd = include("https://github.com/tensorchord/envdlib") def build(): - base(os="ubuntu20.04", language="python") + base(os="ubuntu22.04", language="python") envd.tensorboard(8000) ``` """ diff --git a/envd/api/v0/config.py b/envd/api/v0/config.py index bc13b382c..de9180a96 100644 --- a/envd/api/v0/config.py +++ b/envd/api/v0/config.py @@ -148,7 +148,7 @@ def julia_pkg_server(url: str): def rstudio_server(): """ - Enable the RStudio Server (only work for `base(os="ubuntu20.04", language="r")`) + Enable the RStudio Server (only work for `base(os="ubuntu22.04", language="r")`) """ diff --git a/envd/api/v1/__init__.py b/envd/api/v1/__init__.py index 949e1319e..1124ff4ab 100644 --- a/envd/api/v1/__init__.py +++ b/envd/api/v1/__init__.py @@ -33,7 +33,7 @@ """ -def base(image: str = "ubuntu:20.04", dev: bool = False): +def base(image: str = "ubuntu:22.04", dev: bool = False): """Set up the base env. Args: @@ -99,7 +99,7 @@ def include(git: str): envd = include("https://github.com/tensorchord/envdlib") def build(): - base(os="ubuntu20.04", language="python") + base(os="ubuntu22.04", language="python") envd.tensorboard(host_port=8000) ``` """ diff --git a/envd/api/v1/config.py b/envd/api/v1/config.py index 2ab27b330..55de8dd58 100644 --- a/envd/api/v1/config.py +++ b/envd/api/v1/config.py @@ -154,7 +154,7 @@ def julia_pkg_server(url: str): def rstudio_server(): """ - Enable the RStudio Server (only work for `base(os="ubuntu20.04", language="r")`) + Enable the RStudio Server (only work for `base(os="ubuntu22.04", language="r")`) """ diff --git a/envd/api/v1/install.py b/envd/api/v1/install.py index ba4eb19a8..7bd1c7e89 100644 --- a/envd/api/v1/install.py +++ b/envd/api/v1/install.py @@ -120,7 +120,7 @@ def cuda(version: str, cudnn: Optional[str] = "8"): This will replace the default base image to an `nvidia/cuda` image. You can also use a CUDA base image directly like - `base(image="nvidia/cuda:12.2.0-devel-ubuntu20.04", dev=True)`. + `base(image="nvidia/cuda:12.2.0-devel-ubuntu22.04", dev=True)`. Args: version (str): CUDA version, such as '11.6.2' diff --git a/examples/conda/build.envd b/examples/conda/build.envd index 41c73fe27..7d04d49b2 100644 --- a/examples/conda/build.envd +++ b/examples/conda/build.envd @@ -27,6 +27,6 @@ custom_channels: ], channel=["pytorch"], ) - base(os="ubuntu20.04", language="python3.8") + base(os="ubuntu22.04", language="python3.8") install.python_packages(name=["flask"]) install.cuda(version="11.2.2", cudnn="8") diff --git a/examples/dgl/build.envd b/examples/dgl/build.envd index b1fb43487..7fb078195 100644 --- a/examples/dgl/build.envd +++ b/examples/dgl/build.envd @@ -1,6 +1,6 @@ def build(): - # Use ubuntu20.04 as base image and install python - base(os="ubuntu20.04", language="python3") + # Use ubuntu22.04 as base image and install python + base(os="ubuntu22.04", language="python3") # Add the packages you are using here install.python_packages(["numpy", "dgl", "torch"]) @@ -13,8 +13,8 @@ def build(): def build_gpu(): - # Use ubuntu20.04 as base image and install python - base(os="ubuntu20.04", language="python3") + # Use ubuntu22.04 as base image and install python + base(os="ubuntu22.04", language="python3") # install cuda install.cuda(version="11.2.2", cudnn="8") diff --git a/examples/download_files/build.envd b/examples/download_files/build.envd index 1a59cf8c2..8152e9f7f 100644 --- a/examples/download_files/build.envd +++ b/examples/download_files/build.envd @@ -1,5 +1,5 @@ def build(): - base(os="ubuntu20.04", language="python") + base(os="ubuntu22.04", language="python") io.http( url="https://github.com/tensorchord/envd/releases/download/v0.2.0-alpha.18/envd-ssh_0.2.0-alpha.18_Linux_x86_64", checksum="sha256:163fa5d9775a3666ec91e2422a794277cc8575147f15767d364cc40157888cfb", diff --git a/examples/dpgen2/build.envd b/examples/dpgen2/build.envd index 904cf80d9..0222cacb0 100644 --- a/examples/dpgen2/build.envd +++ b/examples/dpgen2/build.envd @@ -23,7 +23,7 @@ def install_kubectl_kind(env_name): def build(): - base(os="ubuntu20.04", language="python3.9") + base(os="ubuntu22.04", language="python3.9") install.python_packages( name=[ "pydflow", diff --git a/examples/ianvs/build.envd b/examples/ianvs/build.envd index efd9206f4..4da057f5b 100644 --- a/examples/ianvs/build.envd +++ b/examples/ianvs/build.envd @@ -1,5 +1,5 @@ def build(): - base(os="ubuntu20.04", language="python3.6") + base(os="ubuntu22.04", language="python3.6") shell("zsh") install.apt_packages(name=["git", "libgl1-mesa-glx", "zip"]) run( diff --git a/examples/include_pkg/build.envd b/examples/include_pkg/build.envd index dd5a357ba..9ffbf34bb 100644 --- a/examples/include_pkg/build.envd +++ b/examples/include_pkg/build.envd @@ -2,5 +2,5 @@ envdlib = include("https://github.com/tensorchord/envdlib") def build(): - base(os="ubuntu20.04", language="python") + base(os="ubuntu22.04", language="python") envdlib.tensorboard(8888) diff --git a/examples/julia-basic/build.envd b/examples/julia-basic/build.envd index 712dbd641..a6cefa217 100644 --- a/examples/julia-basic/build.envd +++ b/examples/julia-basic/build.envd @@ -1,5 +1,5 @@ def build(): - base(os="ubuntu20.04", language="julia") + base(os="ubuntu22.04", language="julia") # config.julia_pkg_server(url="https://mirrors.tuna.tsinghua.edu.cn/julia") install.julia_packages(["Example"]) shell("zsh") diff --git a/examples/llm-inference/build.envd b/examples/llm-inference/build.envd index 66c62568b..3a2c061b1 100644 --- a/examples/llm-inference/build.envd +++ b/examples/llm-inference/build.envd @@ -1,6 +1,6 @@ # syntax=v1 def build(): - # base(os="ubuntu20.04", language="python3") + # base(os="ubuntu22.04", language="python3") base(dev=True) install.conda() install.python() diff --git a/examples/mnist/build.envd b/examples/mnist/build.envd index 5bdaf6d2a..2f1d57c7d 100644 --- a/examples/mnist/build.envd +++ b/examples/mnist/build.envd @@ -1,5 +1,5 @@ def base_env(): - base(os="ubuntu20.04", language="python3") + base(os="ubuntu22.04", language="python3") install.vscode_extensions( [ "ms-python.python", diff --git a/examples/python-basic/build.envd b/examples/python-basic/build.envd index 5b008a357..0ae4b8423 100644 --- a/examples/python-basic/build.envd +++ b/examples/python-basic/build.envd @@ -1,5 +1,5 @@ def build(): - base(os="ubuntu20.04", language="python") + base(os="ubuntu22.04", language="python") # config.pip_index(url = "https://pypi.tuna.tsinghua.edu.cn/simple") install.python_packages( [ diff --git a/examples/pytorch-profiler/build.envd b/examples/pytorch-profiler/build.envd index d7d36570b..88ecca157 100644 --- a/examples/pytorch-profiler/build.envd +++ b/examples/pytorch-profiler/build.envd @@ -2,7 +2,7 @@ envdlib = include("https://github.com/tensorchord/envdlib") def build(): - base(os="ubuntu20.04", language="python3") + base(os="ubuntu22.04", language="python3") shell("zsh") install.cuda(version="11.2.2", cudnn="8") install.python_packages( diff --git a/examples/r-basic/build.envd b/examples/r-basic/build.envd index b30cce31f..522036819 100644 --- a/examples/r-basic/build.envd +++ b/examples/r-basic/build.envd @@ -1,5 +1,5 @@ def build(): - base(os="ubuntu20.04", language="r") + base(os="ubuntu22.04", language="r") install.r_packages( [ "remotes", diff --git a/examples/stable-diffusion/build.envd b/examples/stable-diffusion/build.envd index 68d116870..a5313431b 100644 --- a/examples/stable-diffusion/build.envd +++ b/examples/stable-diffusion/build.envd @@ -1,5 +1,5 @@ def build(): - base(os="ubuntu20.04", language="python") + base(os="ubuntu22.04", language="python") # config.pip_index(url = "https://pypi.tuna.tsinghua.edu.cn/simple") install.python_packages( [ diff --git a/examples/streamlit-hello/build.envd b/examples/streamlit-hello/build.envd index a840563d5..b473aecd9 100644 --- a/examples/streamlit-hello/build.envd +++ b/examples/streamlit-hello/build.envd @@ -1,5 +1,5 @@ def build(): - base(os="ubuntu20.04", language="python") + base(os="ubuntu22.04", language="python") configure_streamlit(8501) diff --git a/examples/streamlit-mnist/build.envd b/examples/streamlit-mnist/build.envd index b71f33d7a..e6624e344 100644 --- a/examples/streamlit-mnist/build.envd +++ b/examples/streamlit-mnist/build.envd @@ -1,5 +1,5 @@ def build(): - base(os="ubuntu20.04", language="python3") + base(os="ubuntu22.04", language="python3") install.vscode_extensions( [ "ms-python.python", @@ -14,7 +14,7 @@ def build(): def serve(): - base(os="ubuntu20.04", language="python3") + base(os="ubuntu22.04", language="python3") configure_streamlit(8501) configure_mnist() diff --git a/pkg/app/interactive.go b/pkg/app/interactive.go index b782ad18d..63283048d 100644 --- a/pkg/app/interactive.go +++ b/pkg/app/interactive.go @@ -225,7 +225,7 @@ func startQuestion(input input) { func generateFile(clicontext *cli.Context) error { var buf bytes.Buffer buf.WriteString("def build():\n") - buf.WriteString(fmt.Sprintf("%sbase(os=\"ubuntu20.04\", language=\"%s\")\n", indentation, selectionMap[LabelLanguage][0])) + buf.WriteString(fmt.Sprintf("%sbase(os=\"ubuntu22.04\", language=\"%s\")\n", indentation, selectionMap[LabelLanguage][0])) buf.WriteString(generatePackagesStr("python", selectionMap[LabelPythonPackage])) buf.WriteString(generatePackagesStr("r", selectionMap[LabelRPackage])) if len(selectionMap[LabelPythonRequirement]) > 0 { diff --git a/pkg/app/template/julia.envd b/pkg/app/template/julia.envd index 12f347ece..b68fc8718 100644 --- a/pkg/app/template/julia.envd +++ b/pkg/app/template/julia.envd @@ -1,6 +1,6 @@ def build(): - # Use ubuntu20.04 as base image and install julia - base(os="ubuntu20.04", language="julia") + # Use ubuntu22.04 as base image and install julia + base(os="ubuntu22.04", language="julia") # Uncomment line below to enable Pypi mirror # config.julia_pkg_server(url="https://mirrors.tuna.tsinghua.edu.cn/julia") diff --git a/pkg/app/template/r.envd b/pkg/app/template/r.envd index bbf60a229..5f7696271 100644 --- a/pkg/app/template/r.envd +++ b/pkg/app/template/r.envd @@ -1,6 +1,6 @@ def build(): - # Use ubuntu20.04 as base image and install r - base(os="ubuntu20.04", language="r") + # Use ubuntu22.04 as base image and install r + base(os="ubuntu22.04", language="r") # Add the packages you are using here install.r_packages( diff --git a/pkg/lang/frontend/starlark/v0/testdata/test.envd b/pkg/lang/frontend/starlark/v0/testdata/test.envd index 9c0e3cb02..33bee60f7 100644 --- a/pkg/lang/frontend/starlark/v0/testdata/test.envd +++ b/pkg/lang/frontend/starlark/v0/testdata/test.envd @@ -1,5 +1,5 @@ def build(): - base(os="ubuntu20.04", language="python3") + base(os="ubuntu22.04", language="python3") install.python_packages( name=[ "numpy", diff --git a/pkg/lang/ir/v0/consts.go b/pkg/lang/ir/v0/consts.go index 172fe25a5..4e68795ca 100644 --- a/pkg/lang/ir/v0/consts.go +++ b/pkg/lang/ir/v0/consts.go @@ -17,7 +17,7 @@ package v0 import "github.com/tensorchord/envd/pkg/util/fileutil" const ( - osDefault = "ubuntu20.04" + osDefault = "ubuntu22.04" languageDefault = "python" languageVersionDefault = "3" CUDNNVersionDefault = "8" diff --git a/pkg/lang/ir/v0/system.go b/pkg/lang/ir/v0/system.go index 5d29fbf4d..7bbdbafe6 100644 --- a/pkg/lang/ir/v0/system.go +++ b/pkg/lang/ir/v0/system.go @@ -218,7 +218,7 @@ func (g *generalGraph) compileBase() (llb.State, error) { base = g.preparePythonBase(llb.Image(types.PythonBaseImage)) case "julia": base = llb.Image(fmt.Sprintf( - "docker.io/%s/julia:1.8rc1-ubuntu20.04-envd-%s", org, v)) + "docker.io/%s/julia:1.8rc1-ubuntu22.04-envd-%s", org, v)) } } else { base = g.compileCUDAPackages("nvidia/cuda") diff --git a/pkg/lang/ir/v1/consts.go b/pkg/lang/ir/v1/consts.go index 2920a8244..75b7ab566 100644 --- a/pkg/lang/ir/v1/consts.go +++ b/pkg/lang/ir/v1/consts.go @@ -17,7 +17,7 @@ package v1 import "github.com/tensorchord/envd/pkg/util/fileutil" const ( - defaultImage = "ubuntu:20.04" + defaultImage = "ubuntu:22.04" CUDNNVersionDefault = "8" aptSourceFilePath = "/etc/apt/sources.list" diff --git a/pkg/types/envd.go b/pkg/types/envd.go index cf019cdab..16b78336b 100644 --- a/pkg/types/envd.go +++ b/pkg/types/envd.go @@ -35,7 +35,7 @@ const ( DefaultCondaPath = "/opt/conda/envs/envd/bin:/opt/conda/bin:/home/envd/.local/bin" DefaultJuliaPath = "/usr/local/julia/bin" // image - PythonBaseImage = "ubuntu:20.04" + PythonBaseImage = "ubuntu:22.04" EnvdStarshipImage = "tensorchord/starship:v0.0.1" // supervisor HorustImage = "tensorchord/horust:v0.2.3" From 76d1c29b9040c1fe5ca0b7633799e1116c532879 Mon Sep 17 00:00:00 2001 From: Keming Date: Thu, 16 Jan 2025 10:30:37 +0800 Subject: [PATCH 2/3] fix test hash Signed-off-by: Keming --- pkg/lang/frontend/starlark/v0/interpreter_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/lang/frontend/starlark/v0/interpreter_test.go b/pkg/lang/frontend/starlark/v0/interpreter_test.go index 99fa4f8ee..fd62e86b3 100644 --- a/pkg/lang/frontend/starlark/v0/interpreter_test.go +++ b/pkg/lang/frontend/starlark/v0/interpreter_test.go @@ -24,6 +24,6 @@ var _ = Describe("Starlark", func() { filename := "testdata/test.envd" hash, err := GetEnvdProgramHash(filename) Expect(err).NotTo(HaveOccurred()) - Expect(hash).To(Equal("cff1c81818116d42")) + Expect(hash).To(Equal("92dcb859b270c28c")) }) }) From 068b457e9474dfcccb0bc07104b33dda8b60ee71 Mon Sep 17 00:00:00 2001 From: Keming Date: Thu, 16 Jan 2025 11:26:00 +0800 Subject: [PATCH 3/3] fix release macos version Signed-off-by: Keming --- .github/workflows/CI.yml | 4 ++-- .github/workflows/release.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index ee352cf91..73d06049c 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -5,13 +5,13 @@ on: branches: - main paths: - - '.github/workflows/**' + - '.github/workflows/CI.yml' - '**.go' - 'Makefile' - 'go.**' pull_request: paths: - - '.github/workflows/**' + - '.github/workflows/CI.yml' - '**.go' - 'Makefile' - 'go.**' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9f675b444..6115a099b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -47,7 +47,7 @@ jobs: timeout-minutes: 20 strategy: matrix: - os: [macos-11, ubuntu-22.04] + os: [macos-13, ubuntu-22.04] steps: - uses: actions/checkout@v4 - name: Get gobin