From 74eae83b54bf5ad79c35598f8d55019d3287c155 Mon Sep 17 00:00:00 2001 From: Ruben ten Hove Date: Thu, 14 May 2020 14:34:01 +0200 Subject: use only python3 in new builds --- Dockerfile | 9 ++++----- README.md | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1adc2167..d82228fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:eoan +FROM ubuntu MAINTAINER David Carlier LABEL "about"="AFLplusplus docker image" RUN apt-get update && apt-get -y install \ @@ -10,8 +10,9 @@ RUN apt-get update && apt-get -y install \ clang-9 \ flex \ git \ - python3.7 \ - python3.7-dev \ + python3 \ + python3-dev \ + python3-setuptools \ gcc-9 \ gcc-9-plugin-dev \ gcc-9-multilib \ @@ -20,8 +21,6 @@ RUN apt-get update && apt-get -y install \ libtool-bin \ libglib2.0-dev \ llvm-9-dev \ - python-setuptools \ - python2.7-dev \ wget \ ca-certificates \ libpixman-1-dev \ diff --git a/README.md b/README.md index a2c81aa4..216fea95 100644 --- a/README.md +++ b/README.md @@ -137,7 +137,7 @@ afl++ has many build options. The easiest is to build and install everything: ```shell -$ sudo apt install build-essential libtool-bin python3 automake flex bison libglib2.0-dev libpixman-1-dev clang python-setuptools llvm +$ sudo apt install build-essential libtool-bin python3-dev automake flex bison libglib2.0-dev libpixman-1-dev clang python3-setuptools llvm $ make distrib $ sudo make install ``` -- cgit 1.4.1