Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
CDL_LuFei
Docs
提交
7b652968
D
Docs
项目概览
CDL_LuFei
/
Docs
与 Fork 源项目一致
Fork自
OpenHarmony / Docs
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
Docs
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7b652968
编写于
8月 30, 2021
作者:
C
conglin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update docker of standard system
Signed-off-by:
N
conglin
<
conglin8023@126.com
>
上级
aa44baa8
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
42 addition
and
27 deletion
+42
-27
docker/CHANGELOG.md
docker/CHANGELOG.md
+2
-2
docker/standard/CHANGELOG.md
docker/standard/CHANGELOG.md
+8
-1
docker/standard/CHANGELOG_en.md
docker/standard/CHANGELOG_en.md
+6
-0
docker/standard/Readme-en.md
docker/standard/Readme-en.md
+3
-3
docker/standard/Readme.md
docker/standard/Readme.md
+3
-3
docker/standard/build.sh
docker/standard/build.sh
+1
-1
docker/standard/prebuilts_download.sh
docker/standard/prebuilts_download.sh
+2
-2
docker/standard/prepare.sh
docker/standard/prepare.sh
+2
-1
en/device-dev/get-code/gettools-acquire.md
en/device-dev/get-code/gettools-acquire.md
+5
-4
en/device-dev/quick-start/quickstart-standard-docker-environment.md
...dev/quick-start/quickstart-standard-docker-environment.md
+3
-3
zh-cn/device-dev/get-code/gettools-acquire.md
zh-cn/device-dev/get-code/gettools-acquire.md
+4
-4
zh-cn/device-dev/quick-start/quickstart-standard-docker-environment.md
...dev/quick-start/quickstart-standard-docker-environment.md
+3
-3
未找到文件。
docker/CHANGELOG.md
浏览文件 @
7b652968
### 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。
...
...
@@ -22,7 +22,7 @@
### 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工具
。
...
...
docker/standard/CHANGELOG.md
浏览文件 @
7b652968
### 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)
新增安装llvm-10.0.1-62608和restool工具。
### 0.0.1(2021/06/02)
提供OpenHarmony 2.0版本docker编译环境,预装编译依赖工具。
\ No newline at end of file
提供OpenHarmony 2.0版本docker编译环境,预装编译依赖工具。
docker/standard/CHANGELOG_en.md
浏览文件 @
7b652968
### 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.
### 0.0.1(2021/06/02)
...
...
docker/standard/Readme-en.md
浏览文件 @
7b652968
...
...
@@ -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.
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:
```
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**
...
...
@@ -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.
2
docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.
3
```
### Building for Standard-System Devices (reference memory ≥ 128 MB)
...
...
docker/standard/Readme.md
浏览文件 @
7b652968
...
...
@@ -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.
2
docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.
3
```
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镜像进行构建
...
...
@@ -30,7 +30,7 @@ cd docs/docker/standard
```
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)
...
...
docker/standard/build.sh
浏览文件 @
7b652968
...
...
@@ -13,4 +13,4 @@
#!/bin/sh
docker build
-t
openharmony-docker-standard:0.0.
2
.
docker build
-t
openharmony-docker-standard:0.0.
3
.
docker/standard/prebuilts_download.sh
浏览文件 @
7b652968
...
...
@@ -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,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/
clang/host,https://repo.huaweicloud.com/harmonyos/compiler/prebuilts_clang_aosp_linux-x86_64/1.0/prebuilts_clang_aosp_linux-x86_64.tar.g
z
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.x
z
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-6
2608/linux/llvm.tar.gz
prebuilts/clang/ohos/linux-x86_64,https://repo.huaweicloud.com/harmonyos/compiler/clang/10.0.1-6
9957/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
"""
if
[
!
-d
"
${
bin_dir
}
"
]
;
then
...
...
docker/standard/prepare.sh
浏览文件 @
7b652968
...
...
@@ -63,11 +63,12 @@ fi
echo link
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
rm
$WORKDIR
/prebuilts/clang
fi
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
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
...
...
en/device-dev/get-code/gettools-acquire.md
浏览文件 @
7b652968
...
...
@@ -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.
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>
</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>
...
...
@@ -69,6 +69,7 @@ OpenHarmony provides the following two types of Docker environments for you to q
</tbody>
</table>
## 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.
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:
```
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
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
```
...
...
en/device-dev/quick-start/quickstart-standard-docker-environment.md
浏览文件 @
7b652968
...
...
@@ -61,13 +61,13 @@ repo forall -c 'git lfs pull'
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:
```
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'
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
```
...
...
zh-cn/device-dev/get-code/gettools-acquire.md
浏览文件 @
7b652968
...
...
@@ -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.
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>
</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>
...
...
@@ -180,13 +180,13 @@ hb set
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构建环境。
```
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
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
```
...
...
zh-cn/device-dev/quick-start/quickstart-standard-docker-environment.md
浏览文件 @
7b652968
...
...
@@ -61,13 +61,13 @@ repo forall -c 'git lfs pull'
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构建环境。
```
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'
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录