From d43c3dd21a0bc59fa6a07764e42636f6cedea44c Mon Sep 17 00:00:00 2001 From: conglin Date: Tue, 4 Jan 2022 16:32:55 +0800 Subject: [PATCH 1/3] update standard docker image Signed-off-by: conglin --- docker/standard/build.sh | 2 +- docker/standard/dockerfile | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docker/standard/build.sh b/docker/standard/build.sh index c2b8fb34f8d..cde53d04912 100755 --- a/docker/standard/build.sh +++ b/docker/standard/build.sh @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -docker build -t openharmony-docker-standard:0.0.5 . +docker build -t openharmony-docker-standard:0.0.6 . diff --git a/docker/standard/dockerfile b/docker/standard/dockerfile index 65baafa7988..101e5587da5 100755 --- a/docker/standard/dockerfile +++ b/docker/standard/dockerfile @@ -90,8 +90,11 @@ RUN apt-get update \ python3.8 \ python3-pip \ cpio \ - && rm -rf /bin/sh \ + && rm -rf /bin/sh /usr/bin/python /usr/bin/python3 \ && ln -s /bin/bash /bin/sh \ + && ln -s /usr/bin/python3.8 /usr/bin/python3 \ + && ln -s /usr/bin/python3.8 /usr/bin/python \ + && python3 -m pip install --user ohos-build \ && mkdir -p $PREBUILTS_DIR/prebuilts $HOME_TOOLS RUN wget -P $HOME_TOOLS https://mirrors.huaweicloud.com/nodejs/v12.18.4/node-v12.18.4-linux-x64.tar.gz \ -- Gitee From 9cb169201db8f7ab2d1095c1a809632ab2963c0f Mon Sep 17 00:00:00 2001 From: c00565983 Date: Tue, 4 Jan 2022 16:39:27 +0800 Subject: [PATCH 2/3] update standard docker image Signed-off-by: c00565983 --- docker/standard/CHANGELOG.md | 4 ++++ docker/standard/CHANGELOG_en.md | 4 ++++ docker/standard/Readme-en.md | 6 +++--- docker/standard/Readme.md | 6 +++--- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/docker/standard/CHANGELOG.md b/docker/standard/CHANGELOG.md index 14fe8b29527..b6c95c10141 100644 --- a/docker/standard/CHANGELOG.md +++ b/docker/standard/CHANGELOG.md @@ -1,3 +1,7 @@ + ### 0.0.6（2022/01/04） + +新增安装hb。 + ### 0.0.5（2021/10/28） 新增安装tar、binutils、git-lfs、gnutls-bin、python3.8、python3-pip、cpio。 diff --git a/docker/standard/CHANGELOG_en.md b/docker/standard/CHANGELOG_en.md index 5f9abe4af49..7d324cb436f 100644 --- a/docker/standard/CHANGELOG_en.md +++ b/docker/standard/CHANGELOG_en.md @@ -1,3 +1,7 @@ + ### 0.0.6 (2022/01/04) + +Added the installation of hb. + ### 0.0.5 (2021/10/28) Added the installation of tar, binutils, git-lfs, gnutls-bin, python3.8, python3-pip, and cpio. diff --git a/docker/standard/Readme-en.md b/docker/standard/Readme-en.md index 36f20d2bc01..0cbe16a2430 100755 --- a/docker/standard/Readme-en.md +++ b/docker/standard/Readme-en.md @@ -10,11 +10,11 @@ The Docker image of OpenHarmony is hosted on [HUAWEI Cloud SWR](https://auth.hua 1. Obtain the Docker image. ``` -docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 +docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.6 ``` 2. Go to the root directory of OpenHarmony code and run the following command to access the Docker build environment: ``` -docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 +docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.6 ``` ##### **Method 2: Using the Dockerfile to Build a Local Docker Image** @@ -30,7 +30,7 @@ cd docs/docker/standard ``` 3. Go to the root directory of OpenHarmony code and run the following command to access the Docker build environment: ``` -docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.5 +docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.6 ``` ### Building for Standard-System Devices (reference memory ≥ 128 MB) diff --git a/docker/standard/Readme.md b/docker/standard/Readme.md index d13820b5911..420a78bda22 100755 --- a/docker/standard/Readme.md +++ b/docker/standard/Readme.md @@ -10,11 +10,11 @@ OpenHarmony的Docker镜像托管在HuaweiCloud SWR上。开发者可以通过该 1. 获取Docker镜像。 ``` -docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 +docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.6 ``` 2. 进入OpenHarmony代码根目录执行如下命令，从而进入Docker构建环境。 ``` -docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 +docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.6 ``` ##### 方式二：通过Dockerfile 构建本地Docker镜像进行构建 @@ -30,7 +30,7 @@ cd docs/docker/standard ``` 3. 进入OpenHarmony代码根目录执行如下命令，从而进入Docker构建环境。 ``` -docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.5 +docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.6 ``` ### 编译源码-标准系统类设备（参考内存≥128MB） -- Gitee From 90fe36aa5ef81b19b374d050439e08af26570d66 Mon Sep 17 00:00:00 2001 From: c00565983 Date: Tue, 4 Jan 2022 17:30:50 +0800 Subject: [PATCH 3/3] update standard docker image Signed-off-by: c00565983 --- en/device-dev/get-code/gettools-acquire.md | 9 +++++---- .../quickstart-standard-docker-environment.md | 6 +++--- zh-cn/device-dev/get-code/gettools-acquire.md | 9 +++++---- .../quickstart-standard-running-hi3516-build.md | 6 +++--- .../quickstart-standard-running-rk3568-build.md | 6 +++--- 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/en/device-dev/get-code/gettools-acquire.md b/en/device-dev/get-code/gettools-acquire.md index c2f9ba20abb..1b9a2f5add7 100644 --- a/en/device-dev/get-code/gettools-acquire.md +++ b/en/device-dev/get-code/gettools-acquire.md @@ -52,7 +52,7 @@ OpenHarmony provides the following two types of Docker environments for you to q

swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard

-

0.0.5

+

0.0.6

HPM-based Docker environment

@@ -71,6 +71,7 @@ OpenHarmony provides the following two types of Docker environments for you to q + ## Preparations Before using the Docker environment, perform the following operations: @@ -180,13 +181,13 @@ hb set 1. Obtain the Docker image. ``` - docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 + docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.6 ``` 2. Go to the root directory of OpenHarmony code and run the following command to access the Docker build environment: ``` - docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 + docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.6 ``` @@ -208,7 +209,7 @@ hb set 3. Go to the root directory of OpenHarmony code and run the following command to access the Docker build environment: ``` - docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.5 + docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.6 ``` diff --git a/en/device-dev/quick-start/quickstart-standard-docker-environment.md b/en/device-dev/quick-start/quickstart-standard-docker-environment.md index 93f11715dc1..4a34f6c7861 100644 --- a/en/device-dev/quick-start/quickstart-standard-docker-environment.md +++ b/en/device-dev/quick-start/quickstart-standard-docker-environment.md @@ -74,13 +74,13 @@ By default, the downloaded prebuilts binary file is stored in **OpenHarmony\_2. 1. Obtain the Docker image. ``` - docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 + docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.6 ``` 2. Go to the root directory of source code and run the following command to access the Docker build environment: ``` - docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 + docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.6 ``` @@ -102,7 +102,7 @@ By default, the downloaded prebuilts binary file is stored in **OpenHarmony\_2. 3. Go to the root directory of source code and run the following command to access the Docker build environment: ``` - docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.5 + docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.6 ``` diff --git a/zh-cn/device-dev/get-code/gettools-acquire.md b/zh-cn/device-dev/get-code/gettools-acquire.md index 0179cc9eb41..07da37e60b2 100644 --- a/zh-cn/device-dev/get-code/gettools-acquire.md +++ b/zh-cn/device-dev/get-code/gettools-acquire.md @@ -52,7 +52,7 @@ OpenHarmony为开发者提供了两种Docker环境，以帮助开发者快速完

swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard

-

0.0.5

+

0.0.6

HPM Docker环境

@@ -71,6 +71,7 @@ OpenHarmony为开发者提供了两种Docker环境，以帮助开发者快速完 + ## 环境准备 在使用docker环境前需要先完成以下操作： @@ -180,13 +181,13 @@ hb set 1. 获取Docker镜像。 ``` - docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 + docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.6 ``` 2. 进入OpenHarmony代码根目录执行如下命令，从而进入Docker构建环境。 ``` - docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 + docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.6 ``` @@ -208,7 +209,7 @@ hb set 3. 进入OpenHarmony代码根目录执行如下命令，从而进入Docker构建环境。 ``` - docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.5 + docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.6 ``` diff --git a/zh-cn/device-dev/quick-start/quickstart-standard-running-hi3516-build.md b/zh-cn/device-dev/quick-start/quickstart-standard-running-hi3516-build.md index 1c1d1ceeb81..dbccccd6df7 100644 --- a/zh-cn/device-dev/quick-start/quickstart-standard-running-hi3516-build.md +++ b/zh-cn/device-dev/quick-start/quickstart-standard-running-hi3516-build.md @@ -43,13 +43,13 @@ bash build/prebuilts_download.sh 1. 获取Docker镜像。 ``` - docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 + docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.6 ``` 2. 进入源码根目录执行如下命令，从而进入Docker构建环境。 ``` - docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 + docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.6 ``` @@ -71,7 +71,7 @@ bash build/prebuilts_download.sh 3. 进入源码根目录执行如下命令，从而进入Docker构建环境。 ``` - docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.5 + docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.6 ``` diff --git a/zh-cn/device-dev/quick-start/quickstart-standard-running-rk3568-build.md b/zh-cn/device-dev/quick-start/quickstart-standard-running-rk3568-build.md index 62bf05129f1..189dc007252 100644 --- a/zh-cn/device-dev/quick-start/quickstart-standard-running-rk3568-build.md +++ b/zh-cn/device-dev/quick-start/quickstart-standard-running-rk3568-build.md @@ -43,13 +43,13 @@ bash build/prebuilts_download.sh 1. 获取Docker镜像。 ``` - docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 + docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.6 ``` 2. 进入源码根目录执行如下命令，从而进入Docker构建环境。 ``` - docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 + docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.6 ``` @@ -71,7 +71,7 @@ bash build/prebuilts_download.sh 3. 进入源码根目录执行如下命令，从而进入Docker构建环境。 ``` - docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.5 + docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.6 ``` -- Gitee