From 2ce0fcb23c4d49130ffe76900d9169c44dca53d8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=98=A4=ED=98=95=EC=84=9D/On-Device=20Lab=28SR=29/Staff?= =?utf8?q?=20Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Thu, 5 Dec 2019 20:54:39 +0900 Subject: [PATCH] [infra/docker] Update install package (#9405) * [infra/docker] Update install package - pylint: check python format - aarch64 build tool Signed-off-by: Hyeongseok Oh * Update Dockerfile.1804 --- infra/docker/Dockerfile | 6 ++++-- infra/docker/Dockerfile.1804 | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/infra/docker/Dockerfile b/infra/docker/Dockerfile index 2ca3b44..3b11e38 100644 --- a/infra/docker/Dockerfile +++ b/infra/docker/Dockerfile @@ -21,7 +21,7 @@ RUN apt-get update && apt-get -qqy install libboost-all-dev libgflags-dev libgoo RUN apt-get update && apt-get -qqy install libprotobuf-dev protobuf-compiler # Additonal tools -RUN apt-get update && apt-get -qqy install doxygen graphviz wget unzip clang-format-3.9 python3 python3-pip hdf5-tools +RUN apt-get update && apt-get -qqy install doxygen graphviz wget unzip clang-format-3.9 python3 python3-pip hdf5-tools pylint RUN pip3 install yapf==0.22.0 numpy # Install google test (source) @@ -38,9 +38,11 @@ RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 60 --slave /us # Install cross build tool gcc version 6.x RUN wget https://releases.linaro.org/components/toolchain/binaries/6.3-2017.02/arm-linux-gnueabihf/gcc-linaro-6.3.1-2017.02-x86_64_arm-linux-gnueabihf.tar.xz -O gcc-hardfp.tar.xz -nv RUN wget https://releases.linaro.org/components/toolchain/binaries/6.2-2016.11/arm-linux-gnueabi/gcc-linaro-6.2.1-2016.11-x86_64_arm-linux-gnueabi.tar.xz -O gcc-softfp.tar.xz -nv +RUN wget https://releases.linaro.org/components/toolchain/binaries/6.2-2016.11/aarch64-linux-gnu/gcc-linaro-6.2.1-2016.11-x86_64_aarch64-linux-gnu.tar.xz -O gcc-aarch64.tar.xz -nv RUN tar -xf gcc-hardfp.tar.xz -C /opt/ && rm -rf gcc-hardfp.tar.xz RUN tar -xf gcc-softfp.tar.xz -C /opt/ && rm -rf gcc-softfp.tar.xz -ENV PATH "/opt/gcc-linaro-6.2.1-2016.11-x86_64_arm-linux-gnueabi/bin:/opt/gcc-linaro-6.3.1-2017.02-x86_64_arm-linux-gnueabihf/bin:$PATH" +RUN tar -xf gcc-aarch64.tar.xz -C /opt/ && rm -rf gcc-aarch64.tar.xz +ENV PATH "/opt/gcc-linaro-6.2.1-2016.11-x86_64_arm-linux-gnueabi/bin:/opt/gcc-linaro-6.3.1-2017.02-x86_64_arm-linux-gnueabihf/bin:/opt/gcc-linaro-6.2.1-2016.11-x86_64_aarch64-linux-gnu/bin:$PATH" ### ### NOTE: Don't add build & install process using installed buildtool above this line diff --git a/infra/docker/Dockerfile.1804 b/infra/docker/Dockerfile.1804 index 82f6444..fad1632 100644 --- a/infra/docker/Dockerfile.1804 +++ b/infra/docker/Dockerfile.1804 @@ -12,7 +12,7 @@ RUN if [ -n "$UBUNTU_MIRROR" ] ; then sed "s/archive.ubuntu.com/${UBUNTU_MIRROR} RUN apt-get update && apt-get -qqy install software-properties-common # Build tool -RUN apt-get update && apt-get -qqy install build-essential cmake scons git lcov +RUN apt-get update && apt-get -qqy install build-essential cmake scons git lcov g++-7-arm-linux-gnueabihf g++-7-aarch64-linux-gnu # Install extra dependencies (Caffe, nnkit) RUN apt-get update && apt-get -qqy install libboost-all-dev libgflags-dev libgoogle-glog-dev libatlas-base-dev libhdf5-dev @@ -21,7 +21,7 @@ RUN apt-get update && apt-get -qqy install libboost-all-dev libgflags-dev libgoo RUN apt-get update && apt-get -qqy install libprotobuf-dev protobuf-compiler # Additonal tools -RUN apt-get update && apt-get -qqy install doxygen graphviz wget unzip clang-format-3.9 python3 python3-pip hdf5-tools +RUN apt-get update && apt-get -qqy install doxygen graphviz wget unzip clang-format-3.9 python3 python3-pip hdf5-tools pylint RUN pip3 install yapf==0.22.0 numpy # Install google test (source) -- 2.7.4