From a76455405dc421c4c8153683b331532cbbbb4b44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=9C=E6=96=B9=E6=98=9F=E7=97=95?= Date: Fri, 25 Sep 2020 15:12:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0Dockerfile=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=8E=89=E4=B8=8D=E9=9C=80=E8=A6=81=E7=9A=84=E4=BE=9D?= =?UTF-8?q?=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 55f786d136..f1e5b20f81 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,10 +6,9 @@ RUN sed -i 's/archive.ubuntu.com/mirrors.163.com/g' /etc/apt/sources.list && \ dpkg --add-architecture i386 && \ apt-get -y update && \ apt-get -y dist-upgrade && \ - apt-get -y install curl git-core tar xz-utils unzip gnupg flex bison gperf build-essential ccache openjdk-8-jdk && \ - apt-get -y install zlib1g-dev libc6-dev-i386 lib32ncurses5-dev x11proto-core-dev libx11-dev lib32z-dev libgl1-mesa-dev libxml2-utils xsltproc lib32z1-dev qemu g++-multilib gcc-multilib libglib2.0-dev libpixman-1-dev linux-libc-dev:i386 && \ - apt-get -y install python3-paramiko python-paramiko python-jenkins python-requests python-xlwt && \ - apt-get -y install gcc-5-aarch64-linux-gnu g++-5-aarch64-linux-gnu aria2 && \ + apt-get -y install openjdk-8-jdk git-core build-essential zlib1g-dev libc6-dev-i386 g++-multilib gcc-multilib linux-libc-dev:i386 && \ + apt-get -y install gcc-5-aarch64-linux-gnu g++-5-aarch64-linux-gnu unzip tar curl && \ + apt-get -y install python3-paramiko python-paramiko python-requests && \ mkdir -p /tools/ninja /tools/gn # 在国内请反注释下行, 因为容器也是个单独的系统，所以别用127.0.0.1 @@ -19,9 +18,10 @@ RUN sed -i 's/archive.ubuntu.com/mirrors.163.com/g' /etc/apt/sources.list && \ RUN cd /tools && \ curl -C - -LO http://releases.llvm.org/8.0.0/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz && \ curl -LO https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-linux.zip && \ - curl -L -o /tools/gn/gn https://archive.softwareheritage.org/browse/content/sha1_git:2dc0d5b26caef44f467de8120b26f8aad8b878be/raw/?filename=gn && \ + curl -LO http://tools.harmonyos.com/mirrors/gn/1523/linux/gn.1523.tar && \ tar Jvxf /tools/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz -C /tools/ && \ unzip /tools/ninja-linux.zip -d /tools/ninja/ && \ + tar xvf /tools/gn.1523.tar && \ chmod a+x /tools/gn/gn && \ rm /tools/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz /tools/ninja-linux.zip && \ rm -rf /var/cache/apt/archives @@ -30,11 +30,12 @@ RUN cd /tools && \ COPY . /OpenArkCompiler WORKDIR /OpenArkCompiler -# create symbolic link and +# create symbolic link RUN mkdir -p /OpenArkCompiler/tools /OpenArkCompiler/tools/gn && \ ln -s /tools/ninja /OpenArkCompiler/tools/ninja_1.9.0 && \ ln -s /tools/gn/gn /OpenArkCompiler/tools/gn/gn && \ ln -s /tools/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-16.04 /OpenArkCompiler/tools/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-16.04 + # compile RUN ["/bin/bash", "-c", "source build/envsetup.sh && make && ls -al "] -- Gitee