提交 7b652968 编写于 作者: C conglin

update docker of standard system

Signed-off-by: Nconglin <conglin8023@126.com>
上级 aa44baa8
### 0.0.5 (2021/06/21) ### 0.0.5 (2021/06/21)
1、更新llvm版本从10.0.1-53907更新到10.0.1-62608支撑ipcamera_hispark_taurus_linux编译。 1、更新llvm版本从10.0.1-53907更新到10.0.1-62608支撑ipcamera_hispark_taurus_linux编译。
2、增加安装bison、flex、bc、u-boot-tools和gcc-arm-linux-gnueabi。 2、增加安装bison、flex、bc、u-boot-tools和gcc-arm-linux-gnueabi。
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
### 0.0.2(2020/12/23) ### 0.0.2(2020/12/23)
增加安装工具tzdata、default-jre、default-jdk、nodejs、hmos_app_packing_tool、hapsigntoolv2和hpm-cli工具 增加安装工具tzdata、default-jre、default-jdk、nodejs、hmos_app_packing_tool、hapsigntoolv2和hpm-cli工具
......
### 0.0.3(2021/08/30)
1、更新llvm版本从10.0.1-62608更新到10.0.1-69957。
2、增加安装gcc_aarch64。
### 0.0.2(2021/08/11) ### 0.0.2(2021/08/11)
新增安装llvm-10.0.1-62608和restool工具。 新增安装llvm-10.0.1-62608和restool工具。
### 0.0.1(2021/06/02) ### 0.0.1(2021/06/02)
提供OpenHarmony 2.0版本docker编译环境,预装编译依赖工具。 提供OpenHarmony 2.0版本docker编译环境,预装编译依赖工具。
\ No newline at end of file
### 0.0.2(2021/08/11) ### 0.0.2(2021/08/11)
1\. Updated LLVM from 10.0.1-62608 to 10.0.1-69957.
2\. Added the installation of gcc_aarch64.
### 0.0.2(2021/08/11)
Add the installation of llvm-10.0.1-62608 and restool. Add the installation of llvm-10.0.1-62608 and restool.
### 0.0.1(2021/06/02) ### 0.0.1(2021/06/02)
......
...@@ -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.2 docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.3
``` ```
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.2 docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.3
``` ```
##### **Method 2: Using the Dockerfile to Build a Local Docker Image** ##### **Method 2: Using the Dockerfile to Build a Local Docker Image**
...@@ -30,7 +30,7 @@ cd docs/docker/standard ...@@ -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: 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.2 docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.3
``` ```
### Building for Standard-System Devices (reference memory ≥ 128 MB) ### Building for Standard-System Devices (reference memory ≥ 128 MB)
......
...@@ -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.2 docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.3
``` ```
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.2 docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.3
``` ```
##### 方式二:通过Dockerfile 构建本地Docker镜像进行构建 ##### 方式二:通过Dockerfile 构建本地Docker镜像进行构建
...@@ -30,7 +30,7 @@ cd docs/docker/standard ...@@ -30,7 +30,7 @@ cd docs/docker/standard
``` ```
3. 进入OpenHarmony代码根目录执行如下命令,从而进入Docker构建环境。 3. 进入OpenHarmony代码根目录执行如下命令,从而进入Docker构建环境。
``` ```
docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.2 docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.3
``` ```
### 编译源码-标准系统类设备(参考内存≥128MB) ### 编译源码-标准系统类设备(参考内存≥128MB)
......
...@@ -13,4 +13,4 @@ ...@@ -13,4 +13,4 @@
#!/bin/sh #!/bin/sh
docker build -t openharmony-docker-standard:0.0.2 . docker build -t openharmony-docker-standard:0.0.3 .
...@@ -30,9 +30,9 @@ prebuilts/python,https://repo.huaweicloud.com/harmonyos/compiler/python/3.8.5/li ...@@ -30,9 +30,9 @@ prebuilts/python,https://repo.huaweicloud.com/harmonyos/compiler/python/3.8.5/li
prebuilts/mingw-w64/ohos/linux-x86_64,https://repo.huaweicloud.com/harmonyos/compiler/mingw-w64/7.0.0/clang-mingw.tar.gz prebuilts/mingw-w64/ohos/linux-x86_64,https://repo.huaweicloud.com/harmonyos/compiler/mingw-w64/7.0.0/clang-mingw.tar.gz
prebuilts,https://repo.huaweicloud.com/harmonyos/compiler/hc-gen/0.65/linux/hc-gen-0.65-linux.tar prebuilts,https://repo.huaweicloud.com/harmonyos/compiler/hc-gen/0.65/linux/hc-gen-0.65-linux.tar
prebuilts/gcc/linux-x86/arm,https://repo.huaweicloud.com/harmonyos/compiler/prebuilts_gcc_linux-x86_arm_gcc-linaro-7.5.0-arm-linux-gnueabi/1.0/prebuilts_gcc_linux-x86_arm_gcc-linaro-7.5.0-arm-linux-gnueabi.tar.gz prebuilts/gcc/linux-x86/arm,https://repo.huaweicloud.com/harmonyos/compiler/prebuilts_gcc_linux-x86_arm_gcc-linaro-7.5.0-arm-linux-gnueabi/1.0/prebuilts_gcc_linux-x86_arm_gcc-linaro-7.5.0-arm-linux-gnueabi.tar.gz
prebuilts/clang/host,https://repo.huaweicloud.com/harmonyos/compiler/prebuilts_clang_aosp_linux-x86_64/1.0/prebuilts_clang_aosp_linux-x86_64.tar.gz prebuilts/gcc/linux-x86/aarch64,https://repo.huaweicloud.com/harmonyos/compiler/prebuilts_gcc_linux-x86_arm_gcc-linaro-7.5.0-arm-linux-gnueabi/1.0/gcc-linaro-7.5.0-2019.12-x86_64-aarch64-linux-gnu.tar.xz
prebuilts/sdk/js-loader/build-tools,https://repo.huaweicloud.com/harmonyos/compiler/ace-loader/1.0/ace-loader.tar.gz prebuilts/sdk/js-loader/build-tools,https://repo.huaweicloud.com/harmonyos/compiler/ace-loader/1.0/ace-loader.tar.gz
prebuilts/clang/ohos/linux-x86_64,https://repo.huaweicloud.com/harmonyos/compiler/clang/10.0.1-62608/linux/llvm.tar.gz prebuilts/clang/ohos/linux-x86_64,https://repo.huaweicloud.com/harmonyos/compiler/clang/10.0.1-69957/linux/clang-69957-linux-x86_64.tar.bz2
prebuilts/build-tools/common,https://repo.huaweicloud.com/harmonyos/compiler/restool/1.023-c/restool.tar.gz prebuilts/build-tools/common,https://repo.huaweicloud.com/harmonyos/compiler/restool/1.023-c/restool.tar.gz
""" """
if [ ! -d "${bin_dir}" ];then if [ ! -d "${bin_dir}" ];then
......
...@@ -63,11 +63,12 @@ fi ...@@ -63,11 +63,12 @@ fi
echo link mingw-w64 echo link mingw-w64
ln -s $TOOLSDIR/mingw-w64 $WORKDIR/prebuilts/mingw-w64 ln -s $TOOLSDIR/mingw-w64 $WORKDIR/prebuilts/mingw-w64
mv $TOOLSDIR/clang/host/prebuilts_clang_aosp_linux-x86_64 $TOOLSDIR/clang/host/linux-x86 mv $TOOLSDIR/clang/ohos/linux-x86_64/clang-69957 $TOOLSDIR/clang/ohos/linux-x86_64/llvm
if [[ -h $WORKDIR/prebuilts/clang ]]; then if [[ -h $WORKDIR/prebuilts/clang ]]; then
rm $WORKDIR/prebuilts/clang rm $WORKDIR/prebuilts/clang
fi fi
echo link clang echo link clang
ln -snf 10.0.1 $TOOLSDIR/clang/ohos/linux-x86_64/llvm/lib/clang/current
ln -s $TOOLSDIR/clang $WORKDIR/prebuilts/clang ln -s $TOOLSDIR/clang $WORKDIR/prebuilts/clang
mv $TOOLSDIR/gcc/linux-x86/arm/prebuilts_gcc_linux-x86_arm_gcc-linaro-7.5.0-arm-linux-gnueabi $TOOLSDIR/gcc/linux-x86/arm/gcc-linaro-7.5.0-arm-linux-gnueabi mv $TOOLSDIR/gcc/linux-x86/arm/prebuilts_gcc_linux-x86_arm_gcc-linaro-7.5.0-arm-linux-gnueabi $TOOLSDIR/gcc/linux-x86/arm/gcc-linaro-7.5.0-arm-linux-gnueabi
......
...@@ -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.2</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.3</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>
...@@ -69,6 +69,7 @@ OpenHarmony provides the following two types of Docker environments for you to q ...@@ -69,6 +69,7 @@ OpenHarmony provides the following two types of Docker environments for you to q
</tbody> </tbody>
</table> </table>
## 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:
...@@ -180,13 +181,13 @@ hb set ...@@ -180,13 +181,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.2 docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.3
``` ```
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.2 docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.3
``` ```
...@@ -208,7 +209,7 @@ hb set ...@@ -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: 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.2 docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.3
``` ```
......
...@@ -61,13 +61,13 @@ repo forall -c 'git lfs pull' ...@@ -61,13 +61,13 @@ repo forall -c 'git lfs pull'
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.2 docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.3
``` ```
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.2 docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.3
``` ```
...@@ -89,7 +89,7 @@ repo forall -c 'git lfs pull' ...@@ -89,7 +89,7 @@ repo forall -c 'git lfs pull'
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.2 docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.3
``` ```
......
...@@ -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.2</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.3</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>
...@@ -180,13 +180,13 @@ hb set ...@@ -180,13 +180,13 @@ hb set
1. 获取Docker镜像。 1. 获取Docker镜像。
``` ```
docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.2 docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.3
``` ```
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.2 docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.3
``` ```
...@@ -208,7 +208,7 @@ hb set ...@@ -208,7 +208,7 @@ hb set
3. 进入OpenHarmony代码根目录执行如下命令,从而进入Docker构建环境。 3. 进入OpenHarmony代码根目录执行如下命令,从而进入Docker构建环境。
``` ```
docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.2 docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.3
``` ```
......
...@@ -61,13 +61,13 @@ repo forall -c 'git lfs pull' ...@@ -61,13 +61,13 @@ repo forall -c 'git lfs pull'
1. 获取Docker镜像。 1. 获取Docker镜像。
``` ```
docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.2 docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.3
``` ```
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.2 docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.3
``` ```
...@@ -89,7 +89,7 @@ repo forall -c 'git lfs pull' ...@@ -89,7 +89,7 @@ repo forall -c 'git lfs pull'
3. 进入OpenHarmony代码根目录执行如下命令,从而进入Docker构建环境。 3. 进入OpenHarmony代码根目录执行如下命令,从而进入Docker构建环境。
``` ```
docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.2 docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.3
``` ```
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册