未验证 提交 d964aa8b 编写于 作者: O openharmony_ci 提交者: Gitee

!1167 更新标准系统docker镜像版本

Merge pull request !1167 from 丛林/master
### 0.0.7(2022/01/11)
新增安装genext2fs和liblz4-tool。
### 0.0.6(2022/01/04) ### 0.0.6(2022/01/04)
新增安装hb。 新增安装hb。
......
### 0.0.7 (2022/01/11)
Added the installation of genext2fs and liblz4-tool.
### 0.0.6 (2022/01/04) ### 0.0.6 (2022/01/04)
Added the installation of hb. Added the installation of hb.
......
...@@ -10,11 +10,11 @@ The Docker image of OpenHarmony is hosted on [HUAWEI Cloud SWR](https://auth.hua ...@@ -10,11 +10,11 @@ The Docker image of OpenHarmony is hosted on [HUAWEI Cloud SWR](https://auth.hua
1. Obtain the Docker image. 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: 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** ##### **Method 2: Using the Dockerfile to Build a Local Docker Image**
...@@ -30,16 +30,16 @@ cd docs/docker/standard ...@@ -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: 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) ### Building for Standard-System Devices (reference memory ≥ 128 MB)
Run the following script to start 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. 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.
......
...@@ -10,11 +10,11 @@ OpenHarmony的Docker镜像托管在HuaweiCloud SWR上。开发者可以通过该 ...@@ -10,11 +10,11 @@ OpenHarmony的Docker镜像托管在HuaweiCloud SWR上。开发者可以通过该
1. 获取Docker镜像。 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构建环境。 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镜像进行构建 ##### 方式二:通过Dockerfile 构建本地Docker镜像进行构建
...@@ -30,16 +30,16 @@ cd docs/docker/standard ...@@ -30,16 +30,16 @@ cd docs/docker/standard
``` ```
3. 进入OpenHarmony代码根目录执行如下命令,从而进入Docker构建环境。 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)
通过如下编译脚本启动标准系统类设备(参考内存≥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/ 目录下。 编译所生成的文件都归档在out/{device_name}/目录下,结果镜像输出在 out/{device_name}/packages/phone/images/ 目录下。
......
...@@ -13,4 +13,4 @@ ...@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
docker build -t openharmony-docker-standard:0.0.6 . docker build -t openharmony-docker-standard:0.0.7 .
...@@ -90,6 +90,8 @@ RUN apt-get update \ ...@@ -90,6 +90,8 @@ RUN apt-get update \
python3.8 \ python3.8 \
python3-pip \ python3-pip \
cpio \ cpio \
genext2fs \
liblz4-tool \
&& rm -rf /bin/sh /usr/bin/python /usr/bin/python3 \ && rm -rf /bin/sh /usr/bin/python /usr/bin/python3 \
&& ln -s /bin/bash /bin/sh \ && ln -s /bin/bash /bin/sh \
&& ln -s /usr/bin/python3.8 /usr/bin/python3 \ && ln -s /usr/bin/python3.8 /usr/bin/python3 \
......
...@@ -52,7 +52,7 @@ OpenHarmony provides the following two types of Docker environments for you to q ...@@ -52,7 +52,7 @@ OpenHarmony provides the following two types of Docker environments for you to q
</td> </td>
<td class="cellrowborder" valign="top" headers="mcps1.2.6.1.3 "><p id="p552616549297"><a name="p552616549297"></a><a name="p552616549297"></a>swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard</p> <td class="cellrowborder" valign="top" headers="mcps1.2.6.1.3 "><p id="p552616549297"><a name="p552616549297"></a><a name="p552616549297"></a>swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard</p>
</td> </td>
<td class="cellrowborder" valign="top" headers="mcps1.2.6.1.4 "><p id="p1633303300"><a name="p1633303300"></a><a name="p1633303300"></a>0.0.6</p> <td class="cellrowborder" valign="top" headers="mcps1.2.6.1.4 "><p id="p1633303300"><a name="p1633303300"></a><a name="p1633303300"></a>0.0.7</p>
</td> </td>
</tr> </tr>
<tr id="row5986201731214"><td class="cellrowborder" align="center" valign="top" width="15.831583158315832%" headers="mcps1.2.6.1.1 "><p id="p136981216143"><a name="p136981216143"></a><a name="p136981216143"></a>HPM-based Docker environment</p> <tr id="row5986201731214"><td class="cellrowborder" align="center" valign="top" width="15.831583158315832%" headers="mcps1.2.6.1.1 "><p id="p136981216143"><a name="p136981216143"></a><a name="p136981216143"></a>HPM-based Docker environment</p>
...@@ -72,6 +72,7 @@ OpenHarmony provides the following two types of Docker environments for you to q ...@@ -72,6 +72,7 @@ OpenHarmony provides the following two types of Docker environments for you to q
## Preparations<a name="section7337134183512"></a> ## Preparations<a name="section7337134183512"></a>
Before using the Docker environment, perform the following operations: Before using the Docker environment, perform the following operations:
...@@ -181,13 +182,13 @@ hb set ...@@ -181,13 +182,13 @@ hb set
1. Obtain the Docker image. 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: 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 ...@@ -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: 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 ...@@ -218,10 +219,10 @@ hb set
Run the following script to start 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, 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. 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.
......
...@@ -74,13 +74,13 @@ By default, the downloaded prebuilts binary file is stored in **OpenHarmony\_2. ...@@ -74,13 +74,13 @@ By default, the downloaded prebuilts binary file is stored in **OpenHarmony\_2.
1. Obtain the Docker image. 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: 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. ...@@ -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: 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. ...@@ -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\). 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. 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.
......
...@@ -52,7 +52,7 @@ OpenHarmony为开发者提供了两种Docker环境,以帮助开发者快速完 ...@@ -52,7 +52,7 @@ OpenHarmony为开发者提供了两种Docker环境,以帮助开发者快速完
</td> </td>
<td class="cellrowborder" valign="top" headers="mcps1.2.6.1.3 "><p id="p552616549297"><a name="p552616549297"></a><a name="p552616549297"></a>swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard</p> <td class="cellrowborder" valign="top" headers="mcps1.2.6.1.3 "><p id="p552616549297"><a name="p552616549297"></a><a name="p552616549297"></a>swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard</p>
</td> </td>
<td class="cellrowborder" valign="top" headers="mcps1.2.6.1.4 "><p id="p1633303300"><a name="p1633303300"></a><a name="p1633303300"></a>0.0.6</p> <td class="cellrowborder" valign="top" headers="mcps1.2.6.1.4 "><p id="p1633303300"><a name="p1633303300"></a><a name="p1633303300"></a>0.0.7</p>
</td> </td>
</tr> </tr>
<tr id="row5986201731214"><td class="cellrowborder" align="center" valign="top" width="15.831583158315832%" headers="mcps1.2.6.1.1 "><p id="p136981216143"><a name="p136981216143"></a><a name="p136981216143"></a>HPM Docker环境</p> <tr id="row5986201731214"><td class="cellrowborder" align="center" valign="top" width="15.831583158315832%" headers="mcps1.2.6.1.1 "><p id="p136981216143"><a name="p136981216143"></a><a name="p136981216143"></a>HPM Docker环境</p>
...@@ -72,6 +72,7 @@ OpenHarmony为开发者提供了两种Docker环境,以帮助开发者快速完 ...@@ -72,6 +72,7 @@ OpenHarmony为开发者提供了两种Docker环境,以帮助开发者快速完
## 环境准备<a name="section7337134183512"></a> ## 环境准备<a name="section7337134183512"></a>
在使用docker环境前需要先完成以下操作: 在使用docker环境前需要先完成以下操作:
...@@ -181,13 +182,13 @@ hb set ...@@ -181,13 +182,13 @@ hb set
1. 获取Docker镜像。 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构建环境。 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 ...@@ -209,7 +210,7 @@ hb set
3. 进入OpenHarmony代码根目录执行如下命令,从而进入Docker构建环境。 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 ...@@ -218,10 +219,10 @@ hb set
通过如下编译脚本启动标准系统类设备(参考内存≥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/ 目录下。 编译所生成的文件都归档在out/{device_name}/目录下,结果镜像输出在 out/{device_name}/packages/phone/images/ 目录下。
......
...@@ -43,13 +43,13 @@ bash build/prebuilts_download.sh ...@@ -43,13 +43,13 @@ bash build/prebuilts_download.sh
1. 获取Docker镜像。 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构建环境。 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 ...@@ -71,7 +71,7 @@ bash build/prebuilts_download.sh
3. 进入源码根目录执行如下命令,从而进入Docker构建环境。 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
``` ```
......
...@@ -43,13 +43,13 @@ bash build/prebuilts_download.sh ...@@ -43,13 +43,13 @@ bash build/prebuilts_download.sh
1. 获取Docker镜像。 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构建环境。 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 ...@@ -71,7 +71,7 @@ bash build/prebuilts_download.sh
3. 进入源码根目录执行如下命令,从而进入Docker构建环境。 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
``` ```
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册