diff --git a/docker/CHANGELOG.md b/docker/CHANGELOG.md index f09cd81c10aef593f40a0934cdc2c5aea715fbd8..9d86d5e86b9b80169494662a960e3f61d37cd825 100644 --- a/docker/CHANGELOG.md +++ b/docker/CHANGELOG.md @@ -1,3 +1,11 @@ +### 0.0.6 （2022/02/10） + +1、更新hb。 + +2、增加安装ruby。 + + + ### 0.0.5 （2021/06/21） 1、更新llvm版本从10.0.1-53907更新到10.0.1-62608，支撑ipcamera_hispark_taurus_linux编译。 diff --git a/docker/CHANGELOG_en.md b/docker/CHANGELOG_en.md index 03fcdf51fa898f88dc522dfaef873105348e62b9..a6adf956e2727dace6583fd2760e481aa470e4df 100644 --- a/docker/CHANGELOG_en.md +++ b/docker/CHANGELOG_en.md @@ -1,3 +1,11 @@ +### 0.0.5 (2021/06/21) + +1\. Updated hb. + +2\. Added the installation of ruby. + + + ### 0.0.5 (2021/06/21) 1\. Updated LLVM from 10.0.1-53907 to 10.0.1-62608. Introduced support for ipcamera\_hispark\_taurus\_linux. diff --git a/docker/Dockerfile b/docker/Dockerfile index 3c9d9c5116dbff8cde10c1c8fe099aee03cfe149..20fffa28a04fee731fcb3dee5feb90e0b26a2439 100755 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -43,16 +43,17 @@ RUN apt-get update -y \ && apt-get install gcc-arm-linux-gnueabi -y \ && apt-get install build-essential \ && apt-get install locales \ + && apt-get install ruby -y \ && locale-gen "en_US.UTF-8" \ && 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 \ - && pip3 install --trusted-host mirrors.aliyun.com -i https://mirrors.aliyun.com/pypi/simple setuptools \ - && pip3 install --trusted-host mirrors.aliyun.com -i https://mirrors.aliyun.com/pypi/simple kconfiglib \ - && pip3 install --trusted-host mirrors.aliyun.com -i http://mirrors.aliyun.com/pypi/simple pycryptodome \ - && pip3 install --trusted-host mirrors.aliyun.com -i https://mirrors.aliyun.com/pypi/simple ecdsa \ - && python3 -m pip install --user ohos-build \ + && pip3 install --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple setuptools \ + && pip3 install --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple kconfiglib \ + && pip3 install --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple pycryptodome \ + && pip3 install --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple ecdsa \ + && pip3 install --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple ohos-build \ && mkdir -p /home/tools \ && wget -P /home/tools https://repo.huaweicloud.com/harmonyos/compiler/clang/10.0.1-62608/linux/llvm.tar.gz \ && wget -P /home/tools https://repo.huaweicloud.com/harmonyos/compiler/hc-gen/0.65/linux/hc-gen-0.65-linux.tar \ diff --git a/docker/README.md b/docker/README.md index 44d9fe07e7bdd915691306115b8e7b8a0e84ba51..f19f4f1b592baf4a4505095507a8c9851b823a43 100755 --- a/docker/README.md +++ b/docker/README.md @@ -8,21 +8,19 @@ OpenHarmony的Docker镜像托管在**HuaweiCloud SWR**上，开发者可以通 | Docker镜像仓库 | 标签 | 说明 | | :----------------------------------------------------------- | :------ | :----------------------------------------------------------- | -| `swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker` | `0.0.5` | 已经预安装HarmonyOSOpenHarmony版本的编译环境，支持轻量系统类设备（参考内存≥128KB）和小型系统类设备（参考内存≥1MB）的版本构建。 | +| `swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker` | `0.0.6` | 已经预安装OpenHarmony版本的编译环境，支持轻量系统类设备（参考内存≥128KB）和小型系统类设备（参考内存≥1MB）的版本构建。 | ### 使用方式及步骤 - 开发者在配置好开发环境后，可以通过以下步骤来使用我们提供的Docker环境，支持Ubuntu/Windows平台，下文将以Ubuntu系统为例进行使用介绍。 - -#### 方式一：从**HuaweiCloud SWR**上直接获取Docker镜像进行构建： + 开发者在配置好开发环境后，可以通过以下步骤来使用我们提供的Docker环境。详情请参见[Docker编译环境](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/get-code/gettools-acquire.md)。 1. 获取Docker镜像 ``` - docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker:0.0.5 + docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker:0.0.6 ``` 2. 进入OpenHarmony代码根目录执行如下命令，从而进入Docker构建环境 ``` - docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker:0.0.5 + docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker:0.0.6 ``` 3. 通过如下命令启动不同平台的编译 ``` @@ -31,25 +29,3 @@ OpenHarmony的Docker镜像托管在**HuaweiCloud SWR**上，开发者可以通 在显示的页面中通过键盘上下键选择需要编译的平台，通过回车确定选择。 hb build -f #执行编译。 ``` - - #### 方式二：通过Dockerfile 构建本地Docker镜像进行构建 -1. 获取Dockerfile脚本文件，用来构建本地Docker镜像 - ``` - git clone https://gitee.com/openharmony/docs.git - ``` -2. 进入Dockerfile代码目录路径执行Docker镜像构建命令 - ``` - cd docs/docker - ./build.sh - ``` -4. 进入OpenHarmony代码根目录执行如下命令，从而进入Docker构建环境 - ``` - docker run -it -v $(pwd):/home/openharmony openharmony-docker:0.0.5 - ``` -5. 通过如下命令启动不同平台的编译 - ``` - hb set #设置工作目录。 - . #输入源码所在目录，点(.)表示当前目录。 - 在显示的页面中通过键盘上下键选择需要编译的平台，通过回车确定选择。 - hb build -f #执行编译。 - ``` diff --git a/docker/README_en.md b/docker/README_en.md index 4c11f5eac495fbb74e56f606660d66ac7123b553..708213426c4690b2c14b7eb395f04376b5254b06 100644 --- a/docker/README_en.md +++ b/docker/README_en.md @@ -8,21 +8,19 @@ The Docker image of OpenHarmony is hosted on [HUAWEI Cloud SWR](https://auth.hua | Docker Image Repository | Tag | Description | | :----------------------------------------------------------- | :------ | :----------------------------------------------------------- | -| `swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker` | `0.0.5` | The HarmonyOSOpenHarmony build environment has been pre-installed. This repository applies to Mini-System Devices (reference memory ≥ 128 KB) and Small-System Devices (reference memory ≥ 1 MB). | +| `swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker` | `0.0.6` | The OpenHarmony build environment has been pre-installed. This repository applies to Mini-System Devices (reference memory ≥ 128 KB) and Small-System Devices (reference memory ≥ 1 MB). | ### Usage - After configuring the development environments, perform the steps below to access the Docker environment. The following steps use Ubuntu as an example (Windows is also supported). - -#### **Method 1: Obtaining the Docker image from HuaweiCloud SWR**： + After configuring the development environments, perform the steps below to access the Docker environment. 1. Obtain the Docker image. ``` - docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker:0.0.5 + docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker: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:0.0.5 + docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker:0.0.6 ``` 3. Run the following script to start building for different platforms. ``` @@ -31,25 +29,3 @@ The Docker image of OpenHarmony is hosted on [HUAWEI Cloud SWR](https://auth.hua Press the Up or Down key to select the platform to build on, then press Enter. hb build -f # Start building. ``` - - #### **Method 2: Using the Dockerfile to Build a Local Docker Image** -1. Obtain the Dockerfile script for a local Docker image. - ``` - git clone https://gitee.com/openharmony/docs.git - ``` -2. Go to the directory of the Dockerfile code and run the following command to build the Docker image: - ``` - cd docs/docker - ./build.sh - ``` -4. 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:0.0.5 - ``` -5. Run the following script to start building for different platforms. - ``` - hb set # Set the working directory. - . # Enter the directory where the source code is stored. If the code is stored in the current directory, enter a period (.). - Press the Up or Down key to select the platform to build on, then press Enter. - hb build -f # Start building. - ``` diff --git a/docker/build.sh b/docker/build.sh index e1f08d1ee475ebdda7a361522233d99aca979dd5..b67f8cf68aab99806f7c2907231393206b2dbd79 100755 --- a/docker/build.sh +++ b/docker/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:0.0.5 . +docker build -t openharmony-docker:0.0.6 . diff --git a/docker/standard/Readme-en.md b/docker/standard/Readme-en.md index b74720651bb24cd48774b6eaaf2884e21f414006..fcc5cf4339bbe2b0310f35a0e070fae848d6decf 100755 --- a/docker/standard/Readme-en.md +++ b/docker/standard/Readme-en.md @@ -6,8 +6,6 @@ The Docker image of OpenHarmony is hosted on [HUAWEI Cloud SWR](https://auth.hua ### Setting Up the Docker Environment for Standard-System Devices (reference memory ≥ 128 MB) -##### **Method 1: Obtaining the Docker image from HuaweiCloud SWR**： - 1. Obtain the Docker image. ``` docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.7 @@ -17,22 +15,6 @@ docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-dock 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** - -1. Obtain the Dockerfile script for a local Docker image. -``` -git clone https://gitee.com/openharmony/docs.git -``` -2. Go to the directory of the Dockerfile code and run the following command to build the Docker image: -``` -cd docs/docker/standard -./build.sh -``` -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.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) diff --git a/docker/standard/Readme.md b/docker/standard/Readme.md index 2bdb472014805d6ee68af247b3dcffd152fad671..7f239102756b60e154265c3d7e767db2694469a6 100755 --- a/docker/standard/Readme.md +++ b/docker/standard/Readme.md @@ -2,12 +2,10 @@ 本文为标准系统类设备Docker使用指导，[点此查看](https://gitee.com/openharmony/docs/blob/master/docker/README.md)小型和轻量系统类设备使用指导。 -OpenHarmony的Docker镜像托管在HuaweiCloud SWR上。开发者可以通过该镜像在很大程度上简化编译前的环境配置。开发者在配置好开发环境后，通过以下步骤来使用Docker环境。本Docker支持Ubuntu/Windows平台，下文将以Ubuntu系统为例进行使用介绍。 +OpenHarmony的Docker镜像托管在HuaweiCloud SWR上。开发者可以通过该镜像在很大程度上简化编译前的环境配置。开发者在配置好开发环境后，通过以下步骤来使用Docker环境。 ### 搭建Docker环境-标准系统类设备（参考内存≥128MB） -##### 方式一：从HuaweiCloud SWR上直接获取Docker镜像进行构建： - 1. 获取Docker镜像。 ``` docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.7 @@ -17,22 +15,6 @@ docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-dock docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.7 ``` -##### 方式二：通过Dockerfile 构建本地Docker镜像进行构建 - -1. 获取Dockerfile脚本文件，用来构建本地Docker镜像。 -``` -git clone https://gitee.com/openharmony/docs.git -``` -2. 进入Dockerfile代码目录路径执行Docker镜像构建命令。 -``` -cd docs/docker/standard -./build.sh -``` -3. 进入OpenHarmony代码根目录执行如下命令，从而进入Docker构建环境。 -``` -docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.7 -``` - ### 编译源码-标准系统类设备（参考内存≥128MB） 通过如下编译脚本启动标准系统类设备（参考内存≥128MB）的编译。 diff --git a/en/device-dev/get-code/gettools-acquire.md b/en/device-dev/get-code/gettools-acquire.md index 4b00335c966bbedd4be221e0aaab63d4212653d5..27055822bc419cf22a635389b6c3765a8a54b711 100644 --- a/en/device-dev/get-code/gettools-acquire.md +++ b/en/device-dev/get-code/gettools-acquire.md @@ -30,7 +30,7 @@ OpenHarmony provides the following two types of Docker environments for you to q

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

-

0.0.5

+

0.0.6

Standard system

@@ -60,6 +60,7 @@ OpenHarmony provides the following two types of Docker environments for you to q + ## Preparations Before using the Docker environment, perform the following operations: @@ -77,12 +78,10 @@ The Docker image of OpenHarmony is hosted on [HUAWEI CLOUD SWR](https://console ### Setting Up the Docker Environment for Mini-System Devices \(reference memory ≥ 128 KB\) and Small-System Devices \(reference memory ≥ 1 MB\) -**Method 1: Obtaining the Docker image from HUAWEI CLOUD SWR** - 1. Obtain the Docker image. ``` - docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker:0.0.5 + docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker:0.0.6 ``` 2. Go to the root directory of OpenHarmony code and run the following command to access the Docker build environment: @@ -90,43 +89,13 @@ The Docker image of OpenHarmony is hosted on [HUAWEI CLOUD SWR](https://console Run the following command in Ubuntu: ``` - docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker:0.0.5 - ``` - - Run the following command in Windows \(assuming that the source code directory is **D:\\OpenHarmony**\): - - ``` - docker run -it -v D:\OpenHarmony:/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker:0.0.5 - ``` - - -**Method 2: Using the Dockerfile to Build a Local Docker Image** - -1. Obtain the Dockerfile script for a local Docker image. - - ``` - git clone https://gitee.com/openharmony/docs.git - ``` - -2. Go to the directory of the Dockerfile code and run the following command to build the Docker image: - - ``` - cd docs/docker - ./build.sh - ``` - -3. Go to the root directory of OpenHarmony code and run the following command to access the Docker build environment: - - Run the following command in Ubuntu: - - ``` - docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker:0.0.5 + docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker:0.0.6 ``` Run the following command in Windows \(assuming that the source code directory is **D:\\OpenHarmony**\): ``` - docker run -it -v D:\OpenHarmony:/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker:0.0.5 + docker run -it -v D:\OpenHarmony:/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker:0.0.6 ``` @@ -164,8 +133,6 @@ hb set ### Setting Up the Docker Environment for Standard-System Devices \(reference memory ≥ 128 MB\) -**Method 1: Obtaining the Docker image from HUAWEI CLOUD SWR** - 1. Obtain the Docker image. ``` @@ -179,28 +146,6 @@ hb set ``` -**Method 2: Using the Dockerfile to Build a Local Docker Image** - -1. Obtain the Dockerfile script for a local Docker image. - - ``` - git clone https://gitee.com/openharmony/docs.git - ``` - -2. Go to the directory of the Dockerfile code and run the following command to build the Docker image: - - ``` - cd docs/docker/standard - ./build.sh - ``` - -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.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\). @@ -209,7 +154,7 @@ Run the following script to start building for standard-system devices \(referen ./build.sh --product-name {product_name} --ccache ``` -**product\_name** indicates the platform supported by the current distribution, for example, Hi3516D V300 and RK3568. +**product\_name** indicates the platform supported by the current distribution, for example, Hi3516DV300 and 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 34d557772b9d5a80846bf587cd38348f57084abd..9374bb781fcdcd4c8a58d3070648e74756f3073c 100644 --- a/en/device-dev/quick-start/quickstart-standard-docker-environment.md +++ b/en/device-dev/quick-start/quickstart-standard-docker-environment.md @@ -61,8 +61,6 @@ By default, the downloaded prebuilts binary file is stored in **OpenHarmony\_2. ## Obtaining the Docker Environment -**Method 1: Obtaining the Docker image from HUAWEI CLOUD SWR** - 1. Obtain the Docker image. ``` @@ -76,28 +74,6 @@ By default, the downloaded prebuilts binary file is stored in **OpenHarmony\_2. ``` -**Method 2: Using the Dockerfile to Build a Local Docker Image** - -1. Obtain the Dockerfile script for a local Docker image. - - ``` - git clone https://gitee.com/openharmony/docs.git - ``` - -2. Go to the directory of the Dockerfile code and run the following command to build the Docker image: - - ``` - cd docs/docker/standard - ./build.sh - ``` - -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.7 - ``` - - ## Building Source Code 1. Run the following script to start building for standard-system devices \(reference memory ≥ 128 MB\). @@ -106,7 +82,7 @@ By default, the downloaded prebuilts binary file is stored in **OpenHarmony\_2. ./build.sh --product-name {product_name} --ccache ``` - **product\_name** indicates the platform supported by the current distribution, for example, Hi3516D V300, rk3568. + **product\_name** indicates the platform supported by the current distribution, for example, Hi3516DV300, 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 9fe2e55209f388f28f3bddae6e5d6a75c2f95fa0..dc8a50e2512fb9d81540f85e30f573545bf987d2 100644 --- a/zh-cn/device-dev/get-code/gettools-acquire.md +++ b/zh-cn/device-dev/get-code/gettools-acquire.md @@ -43,7 +43,7 @@ OpenHarmony为开发者提供了两种Docker环境，以帮助开发者快速完

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

-

0.0.5

+

0.0.6

标准系统

@@ -73,6 +73,7 @@ OpenHarmony为开发者提供了两种Docker环境，以帮助开发者快速完 + ## 环境准备 在使用docker环境前需要先完成以下操作： @@ -90,12 +91,10 @@ OpenHarmony的Docker镜像托管在[HuaweiCloud SWR](https://console.huaweicloud ### 搭建Docker环境-轻量系统类设备（参考内存≥128KB）和小型系统类设备（参考内存≥1MB） -**方式一：从HuaweiCloud SWR上直接获取Docker镜像进行构建：** - 1. 获取Docker镜像。 ``` - docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker:0.0.5 + docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker:0.0.6 ``` 2. 进入OpenHarmony代码根目录执行如下命令，从而进入Docker构建环境。 @@ -103,43 +102,13 @@ OpenHarmony的Docker镜像托管在[HuaweiCloud SWR](https://console.huaweicloud ubuntu下执行： ``` - docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker:0.0.5 - ``` - - windows下执行（假设源码目录为D:\\OpenHarmony）： - - ``` - docker run -it -v D:\OpenHarmony:/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker:0.0.5 - ``` - - -**方式二：通过Dockerfile 构建本地Docker镜像进行构建** - -1. 获取Dockerfile脚本文件，用来构建本地Docker镜像。 - - ``` - git clone https://gitee.com/openharmony/docs.git - ``` - -2. 进入Dockerfile代码目录路径执行Docker镜像构建命令。 - - ``` - cd docs/docker - ./build.sh - ``` - -3. 进入OpenHarmony代码根目录执行如下命令，从而进入Docker构建环境。 - - ubuntu下执行： - - ``` - docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker:0.0.5 + docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker:0.0.6 ``` windows下执行（假设源码目录为D:\\OpenHarmony）： ``` - docker run -it -v D:\OpenHarmony:/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker:0.0.5 + docker run -it -v D:\OpenHarmony:/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker:0.0.6 ``` @@ -192,28 +161,6 @@ hb set ``` -**方式二：通过Dockerfile 构建本地Docker镜像进行构建** - -1. 获取Dockerfile脚本文件，用来构建本地Docker镜像。 - - ``` - git clone https://gitee.com/openharmony/docs.git - ``` - -2. 进入Dockerfile代码目录路径执行Docker镜像构建命令。 - - ``` - cd docs/docker/standard - ./build.sh - ``` - -3. 进入OpenHarmony代码根目录执行如下命令，从而进入Docker构建环境。 - - ``` - docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.7 - ``` - - ### 编译源码-标准系统类设备（参考内存≥128MB） 通过如下编译脚本启动标准系统类设备（参考内存≥128MB）的编译。 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 fd9ae39f0364b3d4291b0dc821dbd6ce5cd3073c..25e6a863755583987be76f4fda5f52d7594a7b26 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 @@ -38,8 +38,6 @@ bash build/prebuilts_download.sh ### 获取Docker环境 -**方式一：从HuaweiCloud SWR上直接获取Docker镜像进行构建：** - 1. 获取Docker镜像。 ``` @@ -53,28 +51,6 @@ bash build/prebuilts_download.sh ``` -**方式二：通过Dockerfile 构建本地Docker镜像进行构建**： - -1. 获取Dockerfile脚本文件，用来构建本地Docker镜像。 - - ``` - git clone https://gitee.com/openharmony/docs.git - ``` - -2. 进入Dockerfile代码目录路径执行Docker镜像构建命令。 - - ``` - cd docs/docker/standard - ./build.sh - ``` - -3. 进入源码根目录执行如下命令，从而进入Docker构建环境。 - - ``` - 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 6ae878c55c2ec6f1a539f64b56852b759833133a..62933e064b28f0d7407f59491597759bdff32839 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 @@ -38,8 +38,6 @@ bash build/prebuilts_download.sh ### 获取Docker环境 -**方式一：从HuaweiCloud SWR上直接获取Docker镜像进行构建：** - 1. 获取Docker镜像。 ``` @@ -53,28 +51,6 @@ bash build/prebuilts_download.sh ``` -**方式二：通过Dockerfile 构建本地Docker镜像进行构建**： - -1. 获取Dockerfile脚本文件，用来构建本地Docker镜像。 - - ``` - git clone https://gitee.com/openharmony/docs.git - ``` - -2. 进入Dockerfile代码目录路径执行Docker镜像构建命令。 - - ``` - cd docs/docker/standard - ./build.sh - ``` - -3. 进入源码根目录执行如下命令，从而进入Docker构建环境。 - - ``` - docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.7 - ``` - - ## 使用安装包方式获取编译工具链 ### 安装依赖工具