From c23c664f57b85bc24342d4a590dee48e2e461351 Mon Sep 17 00:00:00 2001 From: wjunLu Date: Sun, 18 Feb 2024 17:05:57 +0800 Subject: [PATCH] Modify README.md and Dockerfile paths. --- README.md | 23 +++++++++++++------ .../22.03-lts-sp2/Dockerfile | 0 .../22.03-lts-sp2/chatglm2-6b.patch | 0 .../22.03-lts-sp2/chatglm_finetune.sh | 0 .../22.03-lts-sp2/chatglm_inference.sh | 0 .../22.03-lts-sp2/stop_inference.sh | 0 .../22.03-lts-sp2/Dockerfile | 0 .../22.03-lts-sp2/fastchat.patch | 0 .../22.03-lts-sp2/Dockerfile | 0 9 files changed, 16 insertions(+), 7 deletions(-) rename llm/{chatglm2_6b => chatglm2_6b-pytorch2.1.0.a1-cann7.0.RC1.alpha002}/22.03-lts-sp2/Dockerfile (100%) rename llm/{chatglm2_6b => chatglm2_6b-pytorch2.1.0.a1-cann7.0.RC1.alpha002}/22.03-lts-sp2/chatglm2-6b.patch (100%) rename llm/{chatglm2_6b => chatglm2_6b-pytorch2.1.0.a1-cann7.0.RC1.alpha002}/22.03-lts-sp2/chatglm_finetune.sh (100%) rename llm/{chatglm2_6b => chatglm2_6b-pytorch2.1.0.a1-cann7.0.RC1.alpha002}/22.03-lts-sp2/chatglm_inference.sh (100%) rename llm/{chatglm2_6b => chatglm2_6b-pytorch2.1.0.a1-cann7.0.RC1.alpha002}/22.03-lts-sp2/stop_inference.sh (100%) rename llm/{fastchat => fastchat-pytorch2.1.0.a1-cann7.0.RC1.alpha002}/22.03-lts-sp2/Dockerfile (100%) rename llm/{fastchat => fastchat-pytorch2.1.0.a1-cann7.0.RC1.alpha002}/22.03-lts-sp2/fastchat.patch (100%) rename pytorch/{2.1.0.a1 => 2.1.0.a1-cann7.0.RC1.alpha002}/22.03-lts-sp2/Dockerfile (100%) diff --git a/README.md b/README.md index c914fbd0..c8a462a7 100644 --- a/README.md +++ b/README.md @@ -17,14 +17,21 @@ openEuler的基础镜像由社区官方发布，目前发布在[openEuler镜像 - 下载命令：`docker pull [远端容器镜像仓URL]openeuler/openeuler[:tags]` - 支持架构：amd64, arm64 - 当前可用Tags的命名: - - [21.09](https://repo.openeuler.org/openEuler-21.09/docker_img/) - - [20.09](https://repo.openeuler.org/openEuler-20.09/docker_img/) - - [20.03-lts](https://repo.openeuler.org/openEuler-20.03-LTS/) - - [20.03-lts-sp1, 20.03, latest](https://repo.openeuler.org/openEuler-20.03-LTS-SP1/docker_img/) + - [20.03-lts](https://repo.openeuler.org/openEuler-20.03-LTS/docker_img/) + - [20.03-lts-sp1](https://repo.openeuler.org/openEuler-20.03-LTS-SP1/docker_img/) - [20.03-lts-sp2](https://repo.openeuler.org/openEuler-20.03-LTS-SP2/docker_img/) - [20.03-lts-sp3](https://repo.openeuler.org/openEuler-20.03-LTS-SP3/docker_img/) - - [21.03](https://repo.openeuler.org/openEuler-21.03/docker_img/) - - [22.03-lts, 22.03, latest](https://repo.openeuler.org/openEuler-22.03-LTS/docker_img/) + - [20.03-lts-sp4, 20.03](https://repo.openeuler.org/openEuler-20.03-LTS-SP4/docker_img/) + - [20.09](https://archives.openeuler.openatom.cn/openEuler-20.09/docker_img/) + - [21.03](https://archives.openeuler.openatom.cn/openEuler-21.03/docker_img/) + - [21.09](https://archives.openeuler.openatom.cn/openEuler-21.09/docker_img/) + - [22.03-lts](https://repo.openeuler.org/openEuler-22.03-LTS/docker_img/) + - [22.09](https://archives.openeuler.openatom.cn/openEuler-22.09/docker_img/) + - [22.03-lts-sp1](https://repo.openeuler.org/openEuler-22.03-LTS-SP1/docker_img/) + - [22.03-lts-sp2](https://repo.openeuler.org/openEuler-22.03-LTS-SP2/docker_img/) + - [22.03-lts-sp3, 22.03, latest](https://repo.openeuler.org/openEuler-22.03-LTS-SP3/docker_img/) + - [23.03](https://repo.openeuler.org/openEuler-23.03/docker_img/) + - [23.09](https://repo.openeuler.org/openEuler-23.09/docker_img/) - 存放路径规则：`openeuler/[openEuler版本号]/Dockerfile`， 例如：openEuler 21.09的Dockerfile位于`openeuler/21.09/Dockerfile`。 @@ -34,8 +41,10 @@ openEuler的基础镜像由社区官方发布，目前发布在[openEuler镜像 - 存放路径规则：`[应用名]/[应用版本号]/[openEuler版本号]/Dockerfile`， 例如：基于openEuler 20.03-lts-sp1的nginx 1.20.1的Dockerfile位于`nginx/1.20.1/20.03-lts-sp1/Dockerfile`。 +特殊地，对于复杂软件栈的应用容器镜像，为了准确表达其依赖情况，Dockerfile存放路径的`[应用版本号]`可以描述为完整的软件栈版本号，例如：`pytorch/2.1.0-cann7.0.RC1.alpha002/22.03-lts-sp2/Dockerfile`存放基于cann7.0.RC1.alpha002和openEuler 22.03-lts-sp2的pytorch 2.1.0应用镜像Dockerfile。 + - Tags命名：合入后，将会发布至openeuler仓库， -例如：`openeuler/nginx:1.20.1-20.03-lts-sp1`。 +例如：`openeuler/nginx:1.20.1-oe2003sp1`。 每个应用镜像，应当包含一个README（例如nginx/README.md），涵盖以下信息： diff --git a/llm/chatglm2_6b/22.03-lts-sp2/Dockerfile b/llm/chatglm2_6b-pytorch2.1.0.a1-cann7.0.RC1.alpha002/22.03-lts-sp2/Dockerfile similarity index 100% rename from llm/chatglm2_6b/22.03-lts-sp2/Dockerfile rename to llm/chatglm2_6b-pytorch2.1.0.a1-cann7.0.RC1.alpha002/22.03-lts-sp2/Dockerfile diff --git a/llm/chatglm2_6b/22.03-lts-sp2/chatglm2-6b.patch b/llm/chatglm2_6b-pytorch2.1.0.a1-cann7.0.RC1.alpha002/22.03-lts-sp2/chatglm2-6b.patch similarity index 100% rename from llm/chatglm2_6b/22.03-lts-sp2/chatglm2-6b.patch rename to llm/chatglm2_6b-pytorch2.1.0.a1-cann7.0.RC1.alpha002/22.03-lts-sp2/chatglm2-6b.patch diff --git a/llm/chatglm2_6b/22.03-lts-sp2/chatglm_finetune.sh b/llm/chatglm2_6b-pytorch2.1.0.a1-cann7.0.RC1.alpha002/22.03-lts-sp2/chatglm_finetune.sh similarity index 100% rename from llm/chatglm2_6b/22.03-lts-sp2/chatglm_finetune.sh rename to llm/chatglm2_6b-pytorch2.1.0.a1-cann7.0.RC1.alpha002/22.03-lts-sp2/chatglm_finetune.sh diff --git a/llm/chatglm2_6b/22.03-lts-sp2/chatglm_inference.sh b/llm/chatglm2_6b-pytorch2.1.0.a1-cann7.0.RC1.alpha002/22.03-lts-sp2/chatglm_inference.sh similarity index 100% rename from llm/chatglm2_6b/22.03-lts-sp2/chatglm_inference.sh rename to llm/chatglm2_6b-pytorch2.1.0.a1-cann7.0.RC1.alpha002/22.03-lts-sp2/chatglm_inference.sh diff --git a/llm/chatglm2_6b/22.03-lts-sp2/stop_inference.sh b/llm/chatglm2_6b-pytorch2.1.0.a1-cann7.0.RC1.alpha002/22.03-lts-sp2/stop_inference.sh similarity index 100% rename from llm/chatglm2_6b/22.03-lts-sp2/stop_inference.sh rename to llm/chatglm2_6b-pytorch2.1.0.a1-cann7.0.RC1.alpha002/22.03-lts-sp2/stop_inference.sh diff --git a/llm/fastchat/22.03-lts-sp2/Dockerfile b/llm/fastchat-pytorch2.1.0.a1-cann7.0.RC1.alpha002/22.03-lts-sp2/Dockerfile similarity index 100% rename from llm/fastchat/22.03-lts-sp2/Dockerfile rename to llm/fastchat-pytorch2.1.0.a1-cann7.0.RC1.alpha002/22.03-lts-sp2/Dockerfile diff --git a/llm/fastchat/22.03-lts-sp2/fastchat.patch b/llm/fastchat-pytorch2.1.0.a1-cann7.0.RC1.alpha002/22.03-lts-sp2/fastchat.patch similarity index 100% rename from llm/fastchat/22.03-lts-sp2/fastchat.patch rename to llm/fastchat-pytorch2.1.0.a1-cann7.0.RC1.alpha002/22.03-lts-sp2/fastchat.patch diff --git a/pytorch/2.1.0.a1/22.03-lts-sp2/Dockerfile b/pytorch/2.1.0.a1-cann7.0.RC1.alpha002/22.03-lts-sp2/Dockerfile similarity index 100% rename from pytorch/2.1.0.a1/22.03-lts-sp2/Dockerfile rename to pytorch/2.1.0.a1-cann7.0.RC1.alpha002/22.03-lts-sp2/Dockerfile -- Gitee