From 7786760ab7f41df61699c0cc11a1a2d72d352c84 Mon Sep 17 00:00:00 2001 From: conglin Date: Thu, 10 Feb 2022 10:47:16 +0800 Subject: [PATCH] update hb and ruby Signed-off-by: conglin --- docker/Dockerfile | 11 ++++++----- docker/build.sh | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 3c9d9c5116..20fffa28a0 100755 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -43,16 +43,17 @@ RUN apt-get update -y \ && apt-get install gcc-arm-linux-gnueabi -y \ && apt-get install build-essential \ && apt-get install locales \ + && apt-get install ruby -y \ && locale-gen "en_US.UTF-8" \ && 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 \ - && pip3 install --trusted-host mirrors.aliyun.com -i https://mirrors.aliyun.com/pypi/simple setuptools \ - && pip3 install --trusted-host mirrors.aliyun.com -i https://mirrors.aliyun.com/pypi/simple kconfiglib \ - && pip3 install --trusted-host mirrors.aliyun.com -i http://mirrors.aliyun.com/pypi/simple pycryptodome \ - && pip3 install --trusted-host mirrors.aliyun.com -i https://mirrors.aliyun.com/pypi/simple ecdsa \ - && python3 -m pip install --user ohos-build \ + && pip3 install --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple setuptools \ + && pip3 install --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple kconfiglib \ + && pip3 install --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple pycryptodome \ + && pip3 install --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple ecdsa \ + && pip3 install --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple ohos-build \ && mkdir -p /home/tools \ && wget -P /home/tools https://repo.huaweicloud.com/harmonyos/compiler/clang/10.0.1-62608/linux/llvm.tar.gz \ && wget -P /home/tools https://repo.huaweicloud.com/harmonyos/compiler/hc-gen/0.65/linux/hc-gen-0.65-linux.tar \ diff --git a/docker/build.sh b/docker/build.sh index e1f08d1ee4..b67f8cf68a 100755 --- a/docker/build.sh +++ b/docker/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:0.0.5 . +docker build -t openharmony-docker:0.0.6 . -- GitLab