scripts: docker: change to Ubuntu 18.04

Ubuntu 18.04 use gcc-7 as default, use it to reduce alternative gcc
installation layer.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
This commit is contained in:
Pan Xiuli 2018-06-12 00:01:49 +08:00 committed by Liam Girdwood
parent 792bd414ee
commit cc4850df19
1 changed files with 1 additions and 8 deletions

View File

@ -14,7 +14,7 @@
# docker run -it -v <insert sof dir here>:/home/sof/work/sof.git -v <soft git dir>:/home/sof/work/soft.git --user `id -u` sof ./incremental.sh
#
FROM ubuntu:16.04
FROM ubuntu:18.04
ARG UID=1000
# Set up proxy from host
@ -48,13 +48,6 @@ RUN apt-get -y update && \
udev \
wget
# Use gcc/g++ 7.
RUN add-apt-repository ppa:ubuntu-toolchain-r/test -y
RUN apt-get -y update
RUN apt-get install -y gcc-7 g++-7
RUN apt-get clean
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 70 --slave /usr/bin/g++ g++ /usr/bin/g++-7
# Use ToT alsa utils for the latest topology patches.
RUN mkdir -p /root/alsa-build && cd /root/alsa-build && \
if [ "x$http_proxy" = "x" ]; then \