From e7ab7fdc6d3982ff5820f8da857561781088f0ea Mon Sep 17 00:00:00 2001 From: haobibo Date: Fri, 12 Sep 2025 02:32:05 +0800 Subject: [PATCH 1/4] upgrade python and torch --- .github/workflows/build-docker-gpu.yml | 111 +++++-------------------- 1 file changed, 22 insertions(+), 89 deletions(-) diff --git a/.github/workflows/build-docker-gpu.yml b/.github/workflows/build-docker-gpu.yml index 8fb6e721..8837b5fb 100644 --- a/.github/workflows/build-docker-gpu.yml +++ b/.github/workflows/build-docker-gpu.yml @@ -33,23 +33,10 @@ jobs: # latest cuda supported by tensorflow: https://tensorflow.google.cn/install/source?hl=en#gpu # latest cuda supported by paddlepadle: https://www.paddlepaddle.org.cn/ # latest cuda supported by vllm: https://docs.vllm.ai/en/latest/getting_started/installation/gpu.html?device=cuda - job-cuda_126: - name: 'cuda_12.6,cuda,nvidia-cuda' - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - run: | - source ./tool.sh - build_image_no_tag nvidia-cuda 12.6.3-cudnn-devel-ubuntu24.04 docker_atom/Dockerfile --build-arg "BASE_IMG=nvidia/cuda:12.6.3-cudnn-devel-ubuntu24.04" && clear_images nvidia/cuda - export IMG_PREFIX_SRC="${IMG_PREFIX_DST}" - build_image_no_tag tmp latest docker_base/Dockerfile --build-arg "BASE_IMG=nvidia-cuda:12.6.3-cudnn-devel-ubuntu24.04" - build_image cuda_12.6 latest docker_cuda/nvidia-cuda.Dockerfile --build-arg "BASE_IMG=tmp" - alias_image cuda_12.6 latest cuda latest - push_image cuda # reserved for vllm: https://github.com/vllm-project/vllm/blob/main/docker/Dockerfile job-cuda_128: - name: 'cuda_12.8' + name: 'cuda_12.8,cuda,nvidia-cuda' runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -61,50 +48,20 @@ jobs: build_image cuda_12.8 latest docker_cuda/nvidia-cuda.Dockerfile --build-arg "BASE_IMG=tmp" push_image cuda - # reserved for paddlepaddl 2.6: https://www.paddlepaddle.org.cn - job-cuda_120: - name: 'cuda_12.0' - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - run: | - source ./tool.sh - build_image_no_tag nvidia-cuda 12.0.1-cudnn8-devel-ubuntu22.04 docker_atom/Dockerfile --build-arg "BASE_IMG=nvidia/cuda:12.0.1-cudnn8-devel-ubuntu22.04" && clear_images nvidia/cuda - export IMG_PREFIX_SRC="${IMG_PREFIX_DST}" - build_image_no_tag tmp latest docker_base/Dockerfile --build-arg "BASE_IMG=nvidia-cuda:12.0.1-cudnn8-devel-ubuntu22.04" - build_image cuda_12.0 latest docker_cuda/nvidia-cuda.Dockerfile --build-arg "BASE_IMG=tmp" - push_image cuda - - # reserved for paddlepaddl 2.6, torch, and vllm - job-cuda_118: - name: 'cuda_11.8' - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - run: | - source ./tool.sh - build_image_no_tag nvidia-cuda 11.8.0-cudnn8-devel-ubuntu22.04 docker_atom/Dockerfile --build-arg "BASE_IMG=nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04" && clear_images nvidia/cuda - export IMG_PREFIX_SRC="${IMG_PREFIX_DST}" - build_image_no_tag tmp latest docker_base/Dockerfile --build-arg "BASE_IMG=nvidia-cuda:11.8.0-cudnn8-devel-ubuntu22.04" - build_image cuda_11.8 latest docker_cuda/nvidia-cuda.Dockerfile --build-arg "BASE_IMG=tmp" - push_image cuda - - - # reserved for tensorflow 1.x - job-cuda_112: - name: 'cuda_11.2' + job-cuda_126: + name: 'cuda_12.6' runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - run: | source ./tool.sh - build_image_no_tag nvidia-cuda 11.2.2-cudnn8-devel-ubuntu20.04 docker_atom/Dockerfile --build-arg "BASE_IMG=nvidia/cuda:11.2.2-cudnn8-devel-ubuntu20.04" && clear_images nvidia/cuda + build_image_no_tag nvidia-cuda 12.6.3-cudnn-devel-ubuntu24.04 docker_atom/Dockerfile --build-arg "BASE_IMG=nvidia/cuda:12.6.3-cudnn-devel-ubuntu24.04" && clear_images nvidia/cuda export IMG_PREFIX_SRC="${IMG_PREFIX_DST}" - build_image_no_tag tmp latest docker_base/Dockerfile --build-arg "BASE_IMG=nvidia-cuda:11.2.2-cudnn8-devel-ubuntu20.04" --build-arg "PYTHON_VERSION=3.8" - build_image cuda_11.2 latest docker_cuda/nvidia-cuda.Dockerfile --build-arg "BASE_IMG=tmp" + build_image_no_tag tmp latest docker_base/Dockerfile --build-arg "BASE_IMG=nvidia-cuda:12.6.3-cudnn-devel-ubuntu24.04" + build_image cuda_12.6 latest docker_cuda/nvidia-cuda.Dockerfile --build-arg "BASE_IMG=tmp" + alias_image cuda_12.6 latest cuda latest push_image cuda - job-tf2: name: 'tf2,tf2-cuda126' needs: job-cuda_126 @@ -117,28 +74,16 @@ jobs: alias_image tf2-cuda126 latest tf2 latest push_image - job-torch_cuda126: - name: 'torch,torch-cuda126' - needs: job-cuda_126 - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - run: | - source ./tool.sh - build_image torch-cuda126 latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_12.6" --build-arg "ARG_PROFILE_PYTHON=torch" - alias_image torch-cuda126 latest torch latest - push_image - - job-paddle_cuda120: - name: 'paddle-cuda120,paddle-2.6' - needs: job-cuda_120 + job-torch_cuda128: + name: 'torch,torch-cuda128' + needs: job-cuda_128 runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - run: | source ./tool.sh - build_image paddle-cuda120 latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_12.0" --build-arg "ARG_PROFILE_PYTHON=paddle,mkl" - alias_image paddle-cuda120 latest paddle-2.6 latest + build_image torch-cuda128 latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_12.8" --build-arg "ARG_PROFILE_PYTHON=torch" + alias_image torch-cuda128 latest torch latest push_image job-paddle_cuda126: @@ -155,19 +100,7 @@ jobs: job-py-nlp: - name: 'py-nlp,py-nlp-cuda126' - needs: job-cuda_126 - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - run: | - source ./tool.sh && export IMG_PREFIX_SRC="${IMG_PREFIX_DST}" - build_image py-nlp-cuda126 latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_12.6" --build-arg "ARG_PROFILE_PYTHON=datascience,mkl,torch,nlp" - alias_image py-nlp-cuda126 latest py-nlp latest - push_image - - job-py-nlp-cuda128: - name: 'py-nlp-cuda128' + name: 'py-nlp,py-nlp-cuda128' needs: job-cuda_128 runs-on: ubuntu-latest steps: @@ -175,37 +108,37 @@ jobs: - run: | source ./tool.sh && export IMG_PREFIX_SRC="${IMG_PREFIX_DST}" build_image py-nlp-cuda128 latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_12.8" --build-arg "ARG_PROFILE_PYTHON=datascience,mkl,torch,nlp" + alias_image py-nlp-cuda128 latest py-nlp latest push_image - job-py-cv: name: 'py-cv' - needs: job-cuda_126 + needs: job-cuda_128 runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - run: | source ./tool.sh && export IMG_PREFIX_SRC="${IMG_PREFIX_DST}" - build_image py-cv latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_12.6" --build-arg "ARG_PROFILE_PYTHON=datascience,mkl,torch,cv" + build_image py-cv latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_12.8" --build-arg "ARG_PROFILE_PYTHON=datascience,mkl,torch,cv" push_image job-core-cuda: - name: 'core-cuda,full-cuda-12.6' - needs: job-cuda_126 + name: 'core-cuda,full-cuda-12.8' + needs: job-cuda_128 runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - run: | source ./tool.sh && free_diskspace && export IMG_PREFIX_SRC="${IMG_PREFIX_DST}" - build_image full-cuda-12.6 latest docker_core/Dockerfile \ - --build-arg "BASE_IMG=cuda_12.6" \ + build_image full-cuda-12.8 latest docker_core/Dockerfile \ + --build-arg "BASE_IMG=cuda_12.8" \ --build-arg "ARG_PROFILE_PYTHON=base,datascience,mkl,database,nlp,cv,chem,tf2,torch" \ --build-arg "ARG_PROFILE_R=base,datascience" \ --build-arg "ARG_PROFILE_NODEJS=base" \ --build-arg "ARG_PROFILE_JAVA=base,maven" \ --build-arg "ARG_PROFILE_LATEX=base,cjk" - alias_image full-cuda-12.6 latest core-cuda latest && push_image cuda + alias_image full-cuda-12.8 latest core-cuda latest && push_image cuda job-nvidia-ctk: name: 'nvidia-ctk' @@ -219,7 +152,7 @@ jobs: ## Sync all images in this build (listed by "names") to mirror registry. sync_images: - needs: ["job-core-cuda", "job-py-cv", "job-py-nlp", "job-torch_cuda126", "job-nvidia-ctk"] + needs: ["job-core-cuda", "job-py-cv", "job-py-nlp", "job-torch_cuda128", "job-nvidia-ctk"] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 From d7af2e8e8ddac585b28a2c71b04792e678ed63fa Mon Sep 17 00:00:00 2001 From: haobibo Date: Fri, 12 Sep 2025 02:32:14 +0800 Subject: [PATCH 2/4] upgrade py and torch --- .github/workflows/build-docker.yml | 16 ++++++++-------- docker_atom/work/script-setup.sh | 2 +- docker_base/Dockerfile | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 85e656c3..513fe2c7 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -29,7 +29,7 @@ env: jobs: job-base: - name: 'atom,base,python-3.12' + name: 'atom,base,python-3.13' runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -37,11 +37,11 @@ jobs: source ./tool.sh build_image atom latest docker_atom/Dockerfile && push_image export IMG_PREFIX_SRC="${IMG_PREFIX_DST}" - build_image python-3.12 latest docker_base/Dockerfile --build-arg "PYTHON_VERSION=3.12" - alias_image python-3.12 latest base latest && push_image + build_image python-3.13 latest docker_base/Dockerfile --build-arg "PYTHON_VERSION=3.13" + alias_image python-3.13 latest base latest && push_image job-python: - name: 'python-3.7,python-3.13' + name: 'python-3.7,python-3.12' needs: 'job-base' runs-on: ubuntu-latest steps: @@ -49,7 +49,7 @@ jobs: - run: | source ./tool.sh export IMG_PREFIX_SRC="${IMG_PREFIX_DST}" - build_image python-3.13 latest docker_base/Dockerfile --build-arg "PYTHON_VERSION=3.13" && push_image + build_image python-3.12 latest docker_base/Dockerfile --build-arg "PYTHON_VERSION=3.12" && push_image build_image python-3.7 latest docker_base/Dockerfile --build-arg "PYTHON_VERSION=3.7" && push_image @@ -229,9 +229,9 @@ jobs: build_image_no_tag postgres-15 latest docker_atom/Dockerfile --build-arg "BASE_IMG=postgres:15" export IMG_PREFIX_SRC="${IMG_PREFIX_DST}" - build_image postgres-17 latest docker_base/Dockerfile --build-arg "BASE_IMG=postgres-17" --build-arg "PYTHON_VERSION=3.12" - build_image postgres-16 latest docker_base/Dockerfile --build-arg "BASE_IMG=postgres-16" --build-arg "PYTHON_VERSION=3.12" - build_image postgres-15 latest docker_base/Dockerfile --build-arg "BASE_IMG=postgres-15" --build-arg "PYTHON_VERSION=3.12" + build_image postgres-17 latest docker_base/Dockerfile --build-arg "BASE_IMG=postgres-17" --build-arg "PYTHON_VERSION=3.13" + build_image postgres-16 latest docker_base/Dockerfile --build-arg "BASE_IMG=postgres-16" --build-arg "PYTHON_VERSION=3.13" + build_image postgres-15 latest docker_base/Dockerfile --build-arg "BASE_IMG=postgres-15" --build-arg "PYTHON_VERSION=3.13" push_image postgres- ## DockerKit - including image-syncer and docker-compsoe diff --git a/docker_atom/work/script-setup.sh b/docker_atom/work/script-setup.sh index 7f936e80..fc6fd95d 100644 --- a/docker_atom/work/script-setup.sh +++ b/docker_atom/work/script-setup.sh @@ -56,7 +56,7 @@ EOF } setup_conda_with_mamba() { - VERSION_PYTHON=${1:-"3.12"}; shift 1; + VERSION_PYTHON=${1:-"3.13"}; shift 1; local PREFIX="${CONDA_PREFIX:-/opt/conda}" \ && mkdir -pv "${PREFIX}" \ && mamba install -y --root-prefix="${PREFIX}" --prefix="${PREFIX}" -c "conda-forge" conda pip python="${VERSION_PYTHON}" \ diff --git a/docker_base/Dockerfile b/docker_base/Dockerfile index 251fd00d..f95bc254 100644 --- a/docker_base/Dockerfile +++ b/docker_base/Dockerfile @@ -7,7 +7,7 @@ FROM ${BASE_NAMESPACE:+$BASE_NAMESPACE/}${BASE_IMG} LABEL maintainer="postmaster@labnow.ai" ARG SYS_PY_REPLACE="true" -ARG PYTHON_VERSION="3.12" +ARG PYTHON_VERSION="3.13" ENV CONDA_PREFIX=/opt/conda From c740e56d4d3d056bf97648e34b91769ab19bfed2 Mon Sep 17 00:00:00 2001 From: haobibo Date: Fri, 12 Sep 2025 12:42:44 +0800 Subject: [PATCH 3/4] vllm only supports py 3.12 --- .github/workflows/build-docker.yml | 16 ++++++++-------- docker_atom/work/script-setup.sh | 2 +- docker_base/Dockerfile | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 513fe2c7..85e656c3 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -29,7 +29,7 @@ env: jobs: job-base: - name: 'atom,base,python-3.13' + name: 'atom,base,python-3.12' runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -37,11 +37,11 @@ jobs: source ./tool.sh build_image atom latest docker_atom/Dockerfile && push_image export IMG_PREFIX_SRC="${IMG_PREFIX_DST}" - build_image python-3.13 latest docker_base/Dockerfile --build-arg "PYTHON_VERSION=3.13" - alias_image python-3.13 latest base latest && push_image + build_image python-3.12 latest docker_base/Dockerfile --build-arg "PYTHON_VERSION=3.12" + alias_image python-3.12 latest base latest && push_image job-python: - name: 'python-3.7,python-3.12' + name: 'python-3.7,python-3.13' needs: 'job-base' runs-on: ubuntu-latest steps: @@ -49,7 +49,7 @@ jobs: - run: | source ./tool.sh export IMG_PREFIX_SRC="${IMG_PREFIX_DST}" - build_image python-3.12 latest docker_base/Dockerfile --build-arg "PYTHON_VERSION=3.12" && push_image + build_image python-3.13 latest docker_base/Dockerfile --build-arg "PYTHON_VERSION=3.13" && push_image build_image python-3.7 latest docker_base/Dockerfile --build-arg "PYTHON_VERSION=3.7" && push_image @@ -229,9 +229,9 @@ jobs: build_image_no_tag postgres-15 latest docker_atom/Dockerfile --build-arg "BASE_IMG=postgres:15" export IMG_PREFIX_SRC="${IMG_PREFIX_DST}" - build_image postgres-17 latest docker_base/Dockerfile --build-arg "BASE_IMG=postgres-17" --build-arg "PYTHON_VERSION=3.13" - build_image postgres-16 latest docker_base/Dockerfile --build-arg "BASE_IMG=postgres-16" --build-arg "PYTHON_VERSION=3.13" - build_image postgres-15 latest docker_base/Dockerfile --build-arg "BASE_IMG=postgres-15" --build-arg "PYTHON_VERSION=3.13" + build_image postgres-17 latest docker_base/Dockerfile --build-arg "BASE_IMG=postgres-17" --build-arg "PYTHON_VERSION=3.12" + build_image postgres-16 latest docker_base/Dockerfile --build-arg "BASE_IMG=postgres-16" --build-arg "PYTHON_VERSION=3.12" + build_image postgres-15 latest docker_base/Dockerfile --build-arg "BASE_IMG=postgres-15" --build-arg "PYTHON_VERSION=3.12" push_image postgres- ## DockerKit - including image-syncer and docker-compsoe diff --git a/docker_atom/work/script-setup.sh b/docker_atom/work/script-setup.sh index fc6fd95d..7f936e80 100644 --- a/docker_atom/work/script-setup.sh +++ b/docker_atom/work/script-setup.sh @@ -56,7 +56,7 @@ EOF } setup_conda_with_mamba() { - VERSION_PYTHON=${1:-"3.13"}; shift 1; + VERSION_PYTHON=${1:-"3.12"}; shift 1; local PREFIX="${CONDA_PREFIX:-/opt/conda}" \ && mkdir -pv "${PREFIX}" \ && mamba install -y --root-prefix="${PREFIX}" --prefix="${PREFIX}" -c "conda-forge" conda pip python="${VERSION_PYTHON}" \ diff --git a/docker_base/Dockerfile b/docker_base/Dockerfile index f95bc254..251fd00d 100644 --- a/docker_base/Dockerfile +++ b/docker_base/Dockerfile @@ -7,7 +7,7 @@ FROM ${BASE_NAMESPACE:+$BASE_NAMESPACE/}${BASE_IMG} LABEL maintainer="postmaster@labnow.ai" ARG SYS_PY_REPLACE="true" -ARG PYTHON_VERSION="3.13" +ARG PYTHON_VERSION="3.12" ENV CONDA_PREFIX=/opt/conda From d3e26608a1f92d25d05b39db788220745d5215fb Mon Sep 17 00:00:00 2001 From: haobibo Date: Fri, 12 Sep 2025 13:10:34 +0800 Subject: [PATCH 4/4] update README --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0e088ec0..07daaec5 100644 --- a/README.md +++ b/README.md @@ -27,4 +27,6 @@ LabNow —— 一键开启的数据科学与 AI 环境，加速你的智能创 ## Documentation & Tutorial -[Wiki & Document](https://LabNow.ai) | [中文使用指引(含中国网络镜像)](https://labnow-ai.feishu.cn/wiki/wikcn0sBhMtb1KNRSUTettxWstc) +[Wiki & Document](https://LabNow.ai) +| [中文使用指引(含中国网络镜像)](https://labnow-ai.feishu.cn/wiki/wikcn0sBhMtb1KNRSUTettxWstc) +| [![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/LabNow-ai/lab-foundation)