From e20819a0cec1dca7761ed251e6df7bb7c1300da1 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Mon, 3 Jun 2024 11:10:23 +0200 Subject: tools/docker/old-env: switch to Ubuntu 20.04 16.04 has extremly old gcc (5.4), which don't support C++17. Switch to 20.04 (gcc 9). Split apt commands to separate lines to improve docker caching, otherwise it's takes lots of time to iterate on package set and unclear what exact package causes problems. --- tools/docker/old-env/Dockerfile | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) (limited to 'tools/docker') diff --git a/tools/docker/old-env/Dockerfile b/tools/docker/old-env/Dockerfile index 45a4c22eb..1dc8abaad 100644 --- a/tools/docker/old-env/Dockerfile +++ b/tools/docker/old-env/Dockerfile @@ -3,21 +3,32 @@ # See /tools/docker/README.md for details. -FROM ubuntu:16.04 +FROM ubuntu:20.04 LABEL homepage="https://github.com/google/syzkaller" RUN dpkg --add-architecture i386 && apt-get update -RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q --no-install-recommends \ - sudo make nano git curl ca-certificates gnupg \ - apt-transport-https software-properties-common g++ \ - g++-arm-linux-gnueabi g++-aarch64-linux-gnu g++-powerpc64le-linux-gnu \ - g++-mips64el-linux-gnuabi64 g++-s390x-linux-gnu \ - linux-libc-dev:i386 lib32gcc-5-dev lib32stdc++-5-dev \ - && \ - apt-get -y autoremove && \ - apt-get clean autoclean && \ - rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log} /tmp/* /var/tmp/* +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q --no-install-recommends sudo +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q --no-install-recommends make +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q --no-install-recommends nano +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q --no-install-recommends git +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q --no-install-recommends curl +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q --no-install-recommends ca-certificates +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q --no-install-recommends gnupg +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q --no-install-recommends apt-transport-https +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q --no-install-recommends software-properties-common +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q --no-install-recommends g++ +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q --no-install-recommends g++-arm-linux-gnueabi +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q --no-install-recommends g++-aarch64-linux-gnu +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q --no-install-recommends g++-powerpc64le-linux-gnu +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q --no-install-recommends g++-mips64el-linux-gnuabi64 +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q --no-install-recommends g++-s390x-linux-gnu +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q --no-install-recommends linux-libc-dev:i386 +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q --no-install-recommends lib32gcc-9-dev +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q --no-install-recommends lib32stdc++-9-dev +RUN DEBIAN_FRONTEND=noninteractive apt-get -y autoremove +RUN DEBIAN_FRONTEND=noninteractive apt-get clean autoclean +RUN DEBIAN_FRONTEND=noninteractive rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log} /tmp/* /var/tmp/* RUN curl https://dl.google.com/go/go1.21.9.linux-amd64.tar.gz | tar -C /usr/local -xz ENV PATH /usr/local/go/bin:/gopath/bin:$PATH -- cgit mrf-deployment