From 54489afc26395885e8990b1d29c640a6cd7fdca3 Mon Sep 17 00:00:00 2001 From: zhangweigang Date: Wed, 23 Mar 2022 16:37:59 +0800 Subject: [PATCH] update dockerfile add libmpc-devel, gmp-devel system tools, and update gcc toolchain address Signed-off-by: zhangweigang --- dockerfile/Dockerfile | 16 +++++++--------- dockerfile/Dockerfile_CI | 12 +++++------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dockerfile/Dockerfile b/dockerfile/Dockerfile index f7afd5ca..54edf7cd 100644 --- a/dockerfile/Dockerfile +++ b/dockerfile/Dockerfile @@ -2,13 +2,11 @@ FROM openeuler/openeuler:21.03 # MAINTAINER -MAINTAINER harvey-rtos +MAINTAINER harvey # yum install RUN set -eux; \ - yum -y install git java tar cmake gperf sqlite-devel libffi-devel xz-devel zlib zlib-devel openssl-devel bzip2-devel ncurses-devel readline-devel libpcap-devel parted autoconf-archive -RUN set -eux; \ - yum -y install chrpath gcc-c++ patch rpm-build flex autoconf automake m4 bison bc libtool gettext-devel createrepo_c git net-tools wget sudo hostname rpcgen texinfo python meson dosfstools mtools + yum -y install git java tar cmake gperf sqlite-devel libffi-devel xz-devel zlib zlib-devel openssl-devel bzip2-devel ncurses-devel readline-devel libpcap-devel parted autoconf-archive chrpath gcc-c++ patch rpm-build flex autoconf automake m4 bison bc libtool gettext-devel createrepo_c git net-tools wget sudo hostname rpcgen texinfo python meson dosfstools mtools libmpc-devel gmp-devel # gcc install ARG tools_dir=/usr1/tools @@ -16,8 +14,8 @@ ARG gcc_install_dir=/usr1/openeuler/gcc # change dir to workdir and star install WORKDIR ${gcc_install_dir} -RUN wget https://gitee.com/openeuler/yocto-embedded-tools/attach_files/911964/download/openeuler_gcc_arm32le.tar.xz -P ${tools_dir} -RUN wget https://gitee.com/openeuler/yocto-embedded-tools/attach_files/911963/download/openeuler_gcc_arm64le.tar.xz -P ${tools_dir} +RUN wget https://gitee.com/openeuler/yocto-embedded-tools/attach_files/1003462/download/openeuler_gcc_arm64le.tar.xz -P ${tools_dir} +RUN wget https://gitee.com/openeuler/yocto-embedded-tools/attach_files/1003463/download/openeuler_gcc_arm32le.tar.xz -P ${tools_dir} # change dir to workdir and unpack WORKDIR ${gcc_install_dir} @@ -67,14 +65,14 @@ WORKDIR /usr1 RUN rm -rf tools ARG VERSION=4.3 -ARG user=huawei -ARG group=huawei +ARG user=openeuler +ARG group=openeuler ARG uid=1000 ARG gid=1000 ARG AGENT_WORKDIR=/home/agent # add build user RUN groupadd -g ${gid} ${group} -RUN useradd -c "huawei" -d /home/${user} -u ${uid} -g ${gid} -m ${user} +RUN useradd -c "openeuler" -d /home/${user} -u ${uid} -g ${gid} -m ${user} RUN echo "${user} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers diff --git a/dockerfile/Dockerfile_CI b/dockerfile/Dockerfile_CI index e78e42a7..58b30095 100644 --- a/dockerfile/Dockerfile_CI +++ b/dockerfile/Dockerfile_CI @@ -2,13 +2,11 @@ FROM openeuler/openeuler:21.03 # MAINTAINER -MAINTAINER harvey-rtos +MAINTAINER harvey # yum install RUN set -eux; \ - yum -y install git java tar cmake gperf sqlite-devel libffi-devel xz-devel zlib zlib-devel openssl-devel bzip2-devel ncurses-devel readline-devel libpcap-devel parted autoconf-archive -RUN set -eux; \ - yum -y install chrpath gcc-c++ patch rpm-build flex autoconf automake m4 bison bc libtool gettext-devel createrepo_c git net-tools wget sudo hostname rpcgen texinfo python meson dosfstools mtools + yum -y install git java tar cmake gperf sqlite-devel libffi-devel xz-devel zlib zlib-devel openssl-devel bzip2-devel ncurses-devel readline-devel libpcap-devel parted autoconf-archive chrpath gcc-c++ patch rpm-build flex autoconf automake m4 bison bc libtool gettext-devel createrepo_c git net-tools wget sudo hostname rpcgen texinfo python meson dosfstools mtools libmpc-devel gmp-devel # gcc install ARG tools_dir=/usr1/tools @@ -16,8 +14,8 @@ ARG gcc_install_dir=/usr1/openeuler/gcc # change dir to workdir and star install WORKDIR ${gcc_install_dir} -RUN wget https://gitee.com/openeuler/yocto-embedded-tools/attach_files/911964/download/openeuler_gcc_arm32le.tar.xz -P ${tools_dir} -RUN wget https://gitee.com/openeuler/yocto-embedded-tools/attach_files/911963/download/openeuler_gcc_arm64le.tar.xz -P ${tools_dir} +RUN wget https://gitee.com/openeuler/yocto-embedded-tools/attach_files/1003462/download/openeuler_gcc_arm64le.tar.xz -P ${tools_dir} +RUN wget https://gitee.com/openeuler/yocto-embedded-tools/attach_files/1003463/download/openeuler_gcc_arm32le.tar.xz -P ${tools_dir} # change dir to workdir and unpack WORKDIR ${gcc_install_dir} @@ -98,7 +96,7 @@ VOLUME ${AGENT_WORKDIR} WORKDIR ${AGENT_WORKDIR} # add build user -RUN sudo useradd -m huawei +RUN sudo useradd -m openeuler ENTRYPOINT ["jenkins-agent"] -- Gitee