From ba574c77f1c07de4a7b5b4e3bb10981d78f9a406 Mon Sep 17 00:00:00 2001 From: conglin Date: Thu, 28 Oct 2021 11:31:32 +0800 Subject: [PATCH 1/2] update docker Signed-off-by: conglin --- docker/standard/build.sh | 2 +- docker/standard/dockerfile | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/docker/standard/build.sh b/docker/standard/build.sh index 7627d6123d5..9af19591449 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.4 . +docker build -t openharmony-docker-standard:0.0.5 . diff --git a/docker/standard/dockerfile b/docker/standard/dockerfile index 6e4ef8c3f48..65baafa7988 100755 --- a/docker/standard/dockerfile +++ b/docker/standard/dockerfile @@ -26,6 +26,8 @@ RUN apt-get update \ && apt-get install -y \ apt-utils \ vim \ + tar \ + binutils \ software-properties-common \ openssh-server \ iputils-ping \ @@ -68,6 +70,7 @@ RUN apt-get update \ bison \ doxygen \ git \ + git-lfs \ subversion \ tofrodos \ pigz \ @@ -83,6 +86,10 @@ RUN apt-get update \ lib32z-dev \ openjdk-8-jdk \ ruby \ + gnutls-bin \ + python3.8 \ + python3-pip \ + cpio \ && rm -rf /bin/sh \ && ln -s /bin/bash /bin/sh \ && mkdir -p $PREBUILTS_DIR/prebuilts $HOME_TOOLS -- Gitee From f031c2e88e6fd51109d3aeb0cc3bb42babca90bc Mon Sep 17 00:00:00 2001 From: c00565983 Date: Thu, 28 Oct 2021 11:33:08 +0800 Subject: [PATCH 2/2] update docker Signed-off-by: c00565983 --- docker/standard/CHANGELOG.md | 4 ++++ docker/standard/CHANGELOG_en.md | 4 ++++ docker/standard/Readme-en.md | 6 +++--- docker/standard/Readme.md | 6 +++--- en/device-dev/get-code/gettools-acquire.md | 9 +++++---- .../quickstart-standard-docker-environment.md | 6 +++--- zh-cn/device-dev/get-code/gettools-acquire.md | 9 +++++---- .../quickstart-standard-docker-environment.md | 6 +++--- 8 files changed, 30 insertions(+), 20 deletions(-) diff --git a/docker/standard/CHANGELOG.md b/docker/standard/CHANGELOG.md index 42434adbdc1..14fe8b29527 100644 --- a/docker/standard/CHANGELOG.md +++ b/docker/standard/CHANGELOG.md @@ -1,3 +1,7 @@ + ### 0.0.5（2021/10/28） + +新增安装tar、binutils、git-lfs、gnutls-bin、python3.8、python3-pip、cpio。 + ### 0.0.4（2021/09/18） 1、删除编译依赖的工具预装。 diff --git a/docker/standard/CHANGELOG_en.md b/docker/standard/CHANGELOG_en.md index c14f7da669e..978182aa1cc 100644 --- a/docker/standard/CHANGELOG_en.md +++ b/docker/standard/CHANGELOG_en.md @@ -1,3 +1,7 @@ + ### 0.0.5（2021/10/28） + +Added the installation of tar, binutils, git-lfs, gnutls-bin, python3.8, python3-pip and cpio. + ### 0.0.4（2021/09/18） 1\. dropped pre-installed build dependency tools. diff --git a/docker/standard/Readme-en.md b/docker/standard/Readme-en.md index 679d8e054a1..cd12fd5a04d 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.4 +docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 ``` 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.4 +docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 ``` ##### **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.4 +docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.5 ``` ### Building for Standard-System Devices (reference memory ≥ 128 MB) diff --git a/docker/standard/Readme.md b/docker/standard/Readme.md index 81e6c8a9656..ffedcc403d0 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.4 +docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 ``` 2. 进入OpenHarmony代码根目录执行如下命令，从而进入Docker构建环境。 ``` -docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.4 +docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 ``` ##### 方式二：通过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.4 +docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.5 ``` ### 编译源码-标准系统类设备（参考内存≥128MB） diff --git a/en/device-dev/get-code/gettools-acquire.md b/en/device-dev/get-code/gettools-acquire.md index 31e2b3212c6..ce5512e1a64 100644 --- a/en/device-dev/get-code/gettools-acquire.md +++ b/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

swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard

-

0.0.4

+

0.0.5

HPM-based Docker environment

@@ -70,6 +70,7 @@ OpenHarmony provides the following two types of Docker environments for you to q + ## Preparations Before using the Docker environment, perform the following operations: @@ -179,13 +180,13 @@ hb set 1. Obtain the Docker image. ``` - docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.4 + docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 ``` 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.4 + docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 ``` @@ -207,7 +208,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.4 + docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.5 ``` diff --git a/en/device-dev/quick-start/quickstart-standard-docker-environment.md b/en/device-dev/quick-start/quickstart-standard-docker-environment.md index 6cb423557f3..e04092d2cef 100644 --- a/en/device-dev/quick-start/quickstart-standard-docker-environment.md +++ b/en/device-dev/quick-start/quickstart-standard-docker-environment.md @@ -63,13 +63,13 @@ bash build/prebuilts_download.sh 1. Obtain the Docker image. ``` - docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.4 + docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 ``` 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.4 + docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 ``` @@ -91,7 +91,7 @@ bash build/prebuilts_download.sh 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.4 + docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.5 ``` diff --git a/zh-cn/device-dev/get-code/gettools-acquire.md b/zh-cn/device-dev/get-code/gettools-acquire.md index 543098f5f4a..5381dd4199c 100644 --- a/zh-cn/device-dev/get-code/gettools-acquire.md +++ b/zh-cn/device-dev/get-code/gettools-acquire.md @@ -52,7 +52,7 @@ OpenHarmony为开发者提供了两种Docker环境，以帮助开发者快速完

swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard

-

0.0.4

+

0.0.5

HPM Docker环境

@@ -70,6 +70,7 @@ OpenHarmony为开发者提供了两种Docker环境，以帮助开发者快速完 + ## 环境准备 在使用docker环境前需要先完成以下操作： @@ -179,13 +180,13 @@ hb set 1. 获取Docker镜像。 ``` - docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.4 + docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 ``` 2. 进入OpenHarmony代码根目录执行如下命令，从而进入Docker构建环境。 ``` - docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.4 + docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 ``` @@ -207,7 +208,7 @@ hb set 3. 进入OpenHarmony代码根目录执行如下命令，从而进入Docker构建环境。 ``` - docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.4 + docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.5 ``` diff --git a/zh-cn/device-dev/quick-start/quickstart-standard-docker-environment.md b/zh-cn/device-dev/quick-start/quickstart-standard-docker-environment.md index 3addc9ee979..33b1c799470 100644 --- a/zh-cn/device-dev/quick-start/quickstart-standard-docker-environment.md +++ b/zh-cn/device-dev/quick-start/quickstart-standard-docker-environment.md @@ -63,13 +63,13 @@ bash build/prebuilts_download.sh 1. 获取Docker镜像。 ``` - docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.4 + docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 ``` 2. 进入OpenHarmony代码根目录执行如下命令，从而进入Docker构建环境。 ``` - docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.4 + docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 ``` @@ -91,7 +91,7 @@ bash build/prebuilts_download.sh 3. 进入OpenHarmony代码根目录执行如下命令，从而进入Docker构建环境。 ``` - docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.4 + docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.5 ``` -- Gitee