From 1c2f480dbd36a859bac526739044e31faab81bcf Mon Sep 17 00:00:00 2001 From: Tiago Marques Date: Tue, 29 Aug 2017 16:38:44 +0100 Subject: [PATCH] Revert "docker: update file to use gcc 5.4." GCC v5.4 is not needed to compile the new kernel. This reverts commit 8faf53ef3e4ec1735cc27b1e19c0e38b23eb309b. --- docker/Dockerfile | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 2023fd3..02308a2 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -27,22 +27,11 @@ MAINTAINER Ricardo Martins ENV DEBIAN_FRONTEND noninteractive # Update distro. -RUN echo "deb http://ftp.us.debian.org/debian testing non-free contrib" >> /etc/apt/sources.list -RUN echo "deb http://mirrors.fe.up.pt/ubuntu xenial main restricted universe multiverse" >> /etc/apt/sources.list -RUN echo "deb http://mirrors.fe.up.pt/ubuntu xenial-updates main restricted universe multiverse" >> /etc/apt/sources.list -RUN echo "deb http://mirrors.fe.up.pt/ubuntu xenial-backports main restricted universe multiverse" >> /etc/apt/sources.list -RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 3B4FE6ACC0B21F32 RUN apt-get update -y RUN apt-get dist-upgrade -y -RUN apt-get install -y g++-5 -RUN apt-get install -y gcc-5 RUN apt-get install -y wget RUN apt-get install -y bzip2 RUN apt-get install -y git RUN apt-get install -y g++-multilib +RUN apt-get install -y cmake RUN apt-get install -y file -RUN apt-get install -y vim -RUN apt-get install -y nasm -RUN apt-get install -y build-essential -RUN apt-get install -y make -RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 60 --slave /usr/bin/g++ g++ /usr/bin/g++-5