Update build toolchain in dockerfile (#4669)

- Remove deprecated build tool: gcc-5 softfp
- Install gcc-6 for x64 build

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>

diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile
index 5177cd9..2b2a7b3 100644 (file)
--- a/scripts/docker/Dockerfile
+++ b/scripts/docker/Dockerfile
@@ -7,15 +7,19 @@ RUN apt-get update && apt-get --yes --force-yes install build-essential
 RUN apt-get update && apt-get --yes --force-yes install scons cmake
 RUN apt-get update && apt-get --yes --force-yes install libboost-all-dev
 RUN apt-get update && apt-get --yes --force-yes install git
-RUN apt-get update && apt-get --yes --force-yes install gcc-5-arm-linux-gnueabi g++-5-arm-linux-gnueabi
 RUN apt-get update && apt-get --yes --force-yes install lcov
 RUN apt-get update && apt-get --yes --force-yes install clang-format-3.9 python-pip
 RUN pip install yapf==0.22.0
 RUN apt-get update && apt-get --yes --force-yes install doxygen graphviz
 RUN apt-get update && apt-get --yes --force-yes install wget
+# 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 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 apt-get update && apt-get --yes --force-yes install python3
+# Install native build tool gcc version 6.x
+RUN apt-get update && apt-get --yes --force-yes install software-properties-common
+RUN add-apt-repository ppa:ubuntu-toolchain-r/test && apt-get update && apt-get --yes --force-yes install gcc-6 g++-6
+RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 60 --slave /usr/bin/g++ g++ /usr/bin/g++-6 && update-alternatives --config gcc