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

Merge pull request !1103 from 丛林/master

docker/standard/CHANGELOG.md

+ ### 0.0.6（2022/01/04）
+
+新增安装hb。
+
  ### 0.0.5（2021/10/28）
 
 新增安装tar、binutils、git-lfs、gnutls-bin、python3.8、python3-pip、cpio。

docker/standard/CHANGELOG_en.md

+ ### 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.

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)

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）

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 .

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 \

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
 </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>
-<td class="cellrowborder" valign="top" headers="mcps1.2.6.1.4 "><p id="p1633303300"><a name="p1633303300"></a><a name="p1633303300"></a>0.0.5</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.6</p>
 </td>
 </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>
@@ -71,6 +71,7 @@ OpenHarmony provides the following two types of Docker environments for you to q
 
 
 
+
 ## Preparations<a name="section7337134183512"></a>
 
 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
     ```
 
 

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
     ```
 
 

zh-cn/device-dev/get-code/gettools-acquire.md

@@ -52,7 +52,7 @@ OpenHarmony为开发者提供了两种Docker环境，以帮助开发者快速完
 </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>
-<td class="cellrowborder" valign="top" headers="mcps1.2.6.1.4 "><p id="p1633303300"><a name="p1633303300"></a><a name="p1633303300"></a>0.0.5</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.6</p>
 </td>
 </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>
@@ -71,6 +71,7 @@ OpenHarmony为开发者提供了两种Docker环境，以帮助开发者快速完
 
 
 
+
 ## 环境准备<a name="section7337134183512"></a>
 
 在使用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
     ```
 
 

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
     ```
 
 

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
     ```