From 4fe5102e1446512c80c5ead4cdaa68fa983e62b6 Mon Sep 17 00:00:00 2001 From: raoswing Date: Thu, 12 Aug 2021 09:07:42 +0800 Subject: [PATCH] update docker standard system Signed-off-by: raoswing --- docker/standard/CHANGELOG.md | 4 ++++ docker/standard/CHANGELOG_en.md | 4 ++++ docker/standard/Readme-en.md | 6 +++--- docker/standard/Readme.md | 6 +++--- docker/standard/build.sh | 2 +- docker/standard/prebuilts_download.sh | 4 +++- 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/docker/standard/CHANGELOG.md b/docker/standard/CHANGELOG.md index 2120450f76..7e161f58d0 100644 --- a/docker/standard/CHANGELOG.md +++ b/docker/standard/CHANGELOG.md @@ -1,3 +1,7 @@ + ### 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 diff --git a/docker/standard/CHANGELOG_en.md b/docker/standard/CHANGELOG_en.md index a93871dd53..658a01359e 100644 --- a/docker/standard/CHANGELOG_en.md +++ b/docker/standard/CHANGELOG_en.md @@ -1,3 +1,7 @@ + ### 0.0.2（2021/08/11） + +Add the installation of llvm-10.0.1-62608 and restool. + ### 0.0.1（2021/06/02） Provided a Docker build environment for OpenHarmony 2.0 and pre-installed build dependency tools. \ No newline at end of file diff --git a/docker/standard/Readme-en.md b/docker/standard/Readme-en.md index d59a3ca758..6de964f0f2 100755 --- a/docker/standard/Readme-en.md +++ b/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.1 +docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.2 ``` 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.1 +docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.2 ``` ##### **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.1 +docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.2 ``` ### Building for Standard-System Devices (reference memory ≥ 128 MB) diff --git a/docker/standard/Readme.md b/docker/standard/Readme.md index b051121fba..3ad20d1370 100755 --- a/docker/standard/Readme.md +++ b/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.1 +docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.2 ``` 2. 进入OpenHarmony代码根目录执行如下命令，从而进入Docker构建环境。 ``` -docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.1 +docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.2 ``` ##### 方式二：通过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.1 +docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.2 ``` ### 编译源码-标准系统类设备（参考内存≥128MB） diff --git a/docker/standard/build.sh b/docker/standard/build.sh index 549a773fc7..7f38da71f6 100755 --- a/docker/standard/build.sh +++ b/docker/standard/build.sh @@ -13,4 +13,4 @@ #!/bin/sh -docker build -t openharmony-docker-standard:0.0.1 . +docker build -t openharmony-docker-standard:0.0.2 . diff --git a/docker/standard/prebuilts_download.sh b/docker/standard/prebuilts_download.sh index cc9f4fa6bc..9a410a27d5 100755 --- a/docker/standard/prebuilts_download.sh +++ b/docker/standard/prebuilts_download.sh @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Huawei Device Co., Ltd. +# Copyright (c) 2020 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -32,6 +32,8 @@ prebuilts,https://repo.huaweicloud.com/harmonyos/compiler/hc-gen/0.65/linux/hc-g 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/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/build-tools/common,https://repo.huaweicloud.com/harmonyos/compiler/restool/1.023-c/restool.tar.gz """ if [ ! -d "${bin_dir}" ];then mkdir -p "${bin_dir}" -- GitLab