diff --git a/docker/standard/CHANGELOG.md b/docker/standard/CHANGELOG.md index b6c95c10141a0e12ce3ce6f94a1e0a05caee25b9..b0dc49b1b65b61076f45792a03f39d037122f690 100644 --- a/docker/standard/CHANGELOG.md +++ b/docker/standard/CHANGELOG.md @@ -1,3 +1,7 @@ + ### 0.0.7(2022/01/11) + +新增安装genext2fs和liblz4-tool。 + ### 0.0.6(2022/01/04) 新增安装hb。 diff --git a/docker/standard/CHANGELOG_en.md b/docker/standard/CHANGELOG_en.md index 7d324cb436f12b0d8c0fa20035bf8d74722b77b4..23a128c43f35fdfb11c05c05af5099b4ae6f321d 100644 --- a/docker/standard/CHANGELOG_en.md +++ b/docker/standard/CHANGELOG_en.md @@ -1,3 +1,7 @@ + ### 0.0.7 (2022/01/11) + +Added the installation of genext2fs and liblz4-tool. + ### 0.0.6 (2022/01/04) Added the installation of hb. diff --git a/docker/standard/Readme-en.md b/docker/standard/Readme-en.md index 0cbe16a24305080885cf843beca929010d36990e..b74720651bb24cd48774b6eaaf2884e21f414006 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.6 +docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.7 ``` 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.6 +docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.7 ``` ##### **Method 2: Using the Dockerfile to Build a Local Docker Image** @@ -30,16 +30,16 @@ 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.6 +docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.7 ``` ### Building for Standard-System Devices (reference memory ≥ 128 MB) Run the following script to start building for Standard-System Devices (reference memory ≥ 128 MB) ``` -./build.sh --product-name {product_name} +./build.sh --product-name {product_name} --ccache ``` -**{product_name}** indicates the platform supported by the current distribution, for example, Hi3516DV300. +**{product_name}** indicates the platform supported by the current distribution, for example, Hi3516DV300, rk3568. Files generated during compilation are stored in the **out/{device_name}/** directory, and the generated image is stored in the **out/{device_name}/packages/phone/images/** directory. diff --git a/docker/standard/Readme.md b/docker/standard/Readme.md index 420a78bda22a6cfeb703c86fdffb574d10cee33d..2bdb472014805d6ee68af247b3dcffd152fad671 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.6 +docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.7 ``` 2. 进入OpenHarmony代码根目录执行如下命令,从而进入Docker构建环境。 ``` -docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.6 +docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.7 ``` ##### 方式二:通过Dockerfile 构建本地Docker镜像进行构建 @@ -30,16 +30,16 @@ cd docs/docker/standard ``` 3. 进入OpenHarmony代码根目录执行如下命令,从而进入Docker构建环境。 ``` -docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.6 +docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.7 ``` ### 编译源码-标准系统类设备(参考内存≥128MB) 通过如下编译脚本启动标准系统类设备(参考内存≥128MB)的编译。 ``` -./build.sh --product-name {product_name} +./build.sh --product-name {product_name} --ccache ``` -{product_name}为当前版本支持的平台。比如:Hi3516DV300等。 +{product_name}为当前版本支持的平台。比如:Hi3516DV300、rk3568等。 编译所生成的文件都归档在out/{device_name}/目录下,结果镜像输出在 out/{device_name}/packages/phone/images/ 目录下。 diff --git a/docker/standard/build.sh b/docker/standard/build.sh index cde53d049127f5ae8209f48e10adae46c3fd9316..7becb89d88f900075950347442c812fc6c734505 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.6 . +docker build -t openharmony-docker-standard:0.0.7 . diff --git a/docker/standard/dockerfile b/docker/standard/dockerfile index 101e5587da5ccc906587f8e9e64f17d848e11df9..33db49299bf2ecbc6505cf6ab43b2fd181dd7307 100755 --- a/docker/standard/dockerfile +++ b/docker/standard/dockerfile @@ -90,6 +90,8 @@ RUN apt-get update \ python3.8 \ python3-pip \ cpio \ + genext2fs \ + liblz4-tool \ && 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 \ diff --git a/en/device-dev/get-code/gettools-acquire.md b/en/device-dev/get-code/gettools-acquire.md index 1b9a2f5add7a58574bbd611466983c4a93873631..63c39dc63092d7b1f6b241afae9a76462d0aa348 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.6

+

0.0.7

HPM-based Docker environment

@@ -72,6 +72,7 @@ OpenHarmony provides the following two types of Docker environments for you to q + ## Preparations Before using the Docker environment, perform the following operations: @@ -181,13 +182,13 @@ hb set 1. Obtain the Docker image. ``` - docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.6 + docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.7 ``` 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.6 + docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.7 ``` @@ -209,7 +210,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.6 + docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.7 ``` @@ -218,10 +219,10 @@ hb set Run the following script to start building for standard-system devices \(reference memory ≥ 128 MB\). ``` -./build.sh --product-name {product_name} +./build.sh --product-name {product_name} --ccache ``` -**product\_name** indicates the platform supported by the current distribution, for example, Hi3516D V300. +**product\_name** indicates the platform supported by the current distribution, for example, Hi3516D V300, rk3568. Files generated during building are stored in the **out/{device_name}/** directory, and the generated image is stored in the **out/{device_name}/packages/phone/images/** directory. 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 4a34f6c7861e330e1847936222d86b6ac674713e..5101d177a23fc2724394313d8a9ba2c4cfd89dfe 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.6 + docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.7 ``` 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.6 + docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.7 ``` @@ -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.6 + docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.7 ``` @@ -111,10 +111,10 @@ By default, the downloaded prebuilts binary file is stored in **OpenHarmony\_2. 1. Run the following script to start building for standard-system devices \(reference memory ≥ 128 MB\). ``` - ./build.sh --product-name {product_name} + ./build.sh --product-name {product_name} --ccache ``` - **product\_name** indicates the platform supported by the current distribution, for example, Hi3516D V300. + **product\_name** indicates the platform supported by the current distribution, for example, Hi3516D V300, rk3568. Files generated during building are stored in the **out/{device_name}/** directory, and the generated image is stored in the **out/{device_name}/packages/phone/images/** directory. diff --git a/zh-cn/device-dev/get-code/gettools-acquire.md b/zh-cn/device-dev/get-code/gettools-acquire.md index 07da37e60b221ce7f732510e01e441fcc1445fc4..9fe2e55209f388f28f3bddae6e5d6a75c2f95fa0 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.6

+

0.0.7

HPM Docker环境

@@ -72,6 +72,7 @@ OpenHarmony为开发者提供了两种Docker环境,以帮助开发者快速完 + ## 环境准备 在使用docker环境前需要先完成以下操作: @@ -181,13 +182,13 @@ hb set 1. 获取Docker镜像。 ``` - docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.6 + docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.7 ``` 2. 进入OpenHarmony代码根目录执行如下命令,从而进入Docker构建环境。 ``` - docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.6 + docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.7 ``` @@ -209,7 +210,7 @@ hb set 3. 进入OpenHarmony代码根目录执行如下命令,从而进入Docker构建环境。 ``` - docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.6 + docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.7 ``` @@ -218,10 +219,10 @@ hb set 通过如下编译脚本启动标准系统类设备(参考内存≥128MB)的编译。 ``` -./build.sh --product-name {product_name} +./build.sh --product-name {product_name} --ccache ``` -\{product\_name\}为当前版本支持的平台。比如:Hi3516DV300等。 +\{product\_name\}为当前版本支持的平台。比如:Hi3516DV300和rk3568等。 编译所生成的文件都归档在out/{device_name}/目录下,结果镜像输出在 out/{device_name}/packages/phone/images/ 目录下。 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 dbccccd6df753fbf936bc42dbc7a508e81cb9a02..fd9ae39f0364b3d4291b0dc821dbd6ce5cd3073c 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.6 + docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.7 ``` 2. 进入源码根目录执行如下命令,从而进入Docker构建环境。 ``` - docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.6 + docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.7 ``` @@ -71,7 +71,7 @@ bash build/prebuilts_download.sh 3. 进入源码根目录执行如下命令,从而进入Docker构建环境。 ``` - docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.6 + docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.7 ``` 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 189dc0072522e5ffd4b9122a7852ea595f728e68..6ae878c55c2ec6f1a539f64b56852b759833133a 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.6 + docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.7 ``` 2. 进入源码根目录执行如下命令,从而进入Docker构建环境。 ``` - docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.6 + docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.7 ``` @@ -71,7 +71,7 @@ bash build/prebuilts_download.sh 3. 进入源码根目录执行如下命令,从而进入Docker构建环境。 ``` - docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.6 + docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.7 ```