From 424438edfce9fd2be8b72f6d6242d6a44858a719 Mon Sep 17 00:00:00 2001 From: Ruben ten Hove Date: Wed, 28 Oct 2020 10:35:07 +0100 Subject: stop using deprecated MAINTAINER instruction, use LABEL instead --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 64b04ba6..b4e45087 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ # FROM ubuntu:20.04 AS aflplusplus -MAINTAINER afl++ team +LABEL "maintainer"="afl++ team " LABEL "about"="AFLplusplus docker image" ARG DEBIAN_FRONTEND=noninteractive -- cgit v1.2.3 From 29a9d3aa491fd03fa1cfa1328e49693225352848 Mon Sep 17 00:00:00 2001 From: Ruben ten Hove Date: Wed, 28 Oct 2020 10:36:34 +0100 Subject: add gnuplot for afl-plot --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index b4e45087..be77181c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,8 @@ RUN apt-get update && apt-get upgrade -y && \ libglib2.0-dev \ wget vim jupp nano bash-completion \ apt-utils apt-transport-https ca-certificates gnupg dialog \ - libpixman-1-dev + libpixman-1-dev \ + gnuplot-nox RUN echo deb http://apt.llvm.org/focal/ llvm-toolchain-focal-11 main >> /etc/apt/sources.list && \ wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - -- cgit v1.2.3 From 987ddb72b1f5fb4a55259ddeb6ad67ba0061c73d Mon Sep 17 00:00:00 2001 From: Ruben ten Hove Date: Wed, 28 Oct 2020 10:38:43 +0100 Subject: use fewer layers and remove apt cache also use full-upgrade to ensure all conflicts are resolved --- Dockerfile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index be77181c..f305554d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ LABEL "about"="AFLplusplus docker image" ARG DEBIAN_FRONTEND=noninteractive -RUN apt-get update && apt-get upgrade -y && \ +RUN apt-get update && \ apt-get -y install --no-install-suggests --no-install-recommends \ automake \ bison flex \ @@ -23,24 +23,24 @@ RUN apt-get update && apt-get upgrade -y && \ wget vim jupp nano bash-completion \ apt-utils apt-transport-https ca-certificates gnupg dialog \ libpixman-1-dev \ - gnuplot-nox + gnuplot-nox \ + && rm -rf /var/lib/apt/lists/* RUN echo deb http://apt.llvm.org/focal/ llvm-toolchain-focal-11 main >> /etc/apt/sources.list && \ wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - RUN echo deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu focal main >> /etc/apt/sources.list && \ apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 1E9377A2BA9EF27F - -RUN apt-get update && apt-get upgrade -y -RUN apt-get install -y gcc-10 g++-10 gcc-10-plugin-dev gcc-10-multilib \ - libc++-10-dev gdb lcov - -RUN apt-get install -y clang-11 clang-tools-11 libc++1-11 libc++-11-dev \ +RUN apt-get update && apt-get full-upgrade -y && \ + apt-get -y install --no-install-suggests --no-install-recommends \ + gcc-10 g++-10 gcc-10-plugin-dev gcc-10-multilib libc++-10-dev gdb lcov \ + clang-11 clang-tools-11 libc++1-11 libc++-11-dev \ libc++abi1-11 libc++abi-11-dev libclang1-11 libclang-11-dev \ libclang-common-11-dev libclang-cpp11 libclang-cpp11-dev liblld-11 \ liblld-11-dev liblldb-11 liblldb-11-dev libllvm11 libomp-11-dev \ - libomp5-11 lld-11 lldb-11 llvm-11 llvm-11-dev llvm-11-runtime llvm-11-tools + libomp5-11 lld-11 lldb-11 llvm-11 llvm-11-dev llvm-11-runtime llvm-11-tools \ + && rm -rf /var/lib/apt/lists/* RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 0 RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 0 -- cgit v1.2.3 From 8cdf04ec909d96b64ab786c0b859a0d9ea7c7624 Mon Sep 17 00:00:00 2001 From: Ruben ten Hove Date: Wed, 28 Oct 2020 10:39:45 +0100 Subject: quote the source lines --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index f305554d..6e932fdc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,10 +26,10 @@ RUN apt-get update && \ gnuplot-nox \ && rm -rf /var/lib/apt/lists/* -RUN echo deb http://apt.llvm.org/focal/ llvm-toolchain-focal-11 main >> /etc/apt/sources.list && \ - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - - -RUN echo deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu focal main >> /etc/apt/sources.list && \ +RUN echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-11 main" >> /etc/apt/sources.list && \ + wget -qO - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - + +RUN echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu focal main" >> /etc/apt/sources.list && \ apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 1E9377A2BA9EF27F RUN apt-get update && apt-get full-upgrade -y && \ -- cgit v1.2.3 From 0d0e220b4badbcfaaab67de5a1b82bbc0326515e Mon Sep 17 00:00:00 2001 From: Ruben ten Hove Date: Wed, 28 Oct 2020 10:39:58 +0100 Subject: word-o --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 6e932fdc..788969b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ # This Dockerfile for AFLplusplus uses Ubuntu 20.04 focal and # installs LLVM 11 from llvm.org for afl-clang-lto support :-) # It also installs gcc/g++ 10 from the Ubuntu development platform -# has focal has gcc-10 but not g++-10 ... +# since focal has gcc-10 but not g++-10 ... # FROM ubuntu:20.04 AS aflplusplus -- cgit v1.2.3 From 0f140578120c2cb439539e227f1b6adf42f70f65 Mon Sep 17 00:00:00 2001 From: Ruben ten Hove Date: Wed, 28 Oct 2020 11:00:50 +0100 Subject: this package was getting uninstalled anyway --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 788969b4..511b679c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,7 +34,7 @@ RUN echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu focal main RUN apt-get update && apt-get full-upgrade -y && \ apt-get -y install --no-install-suggests --no-install-recommends \ - gcc-10 g++-10 gcc-10-plugin-dev gcc-10-multilib libc++-10-dev gdb lcov \ + gcc-10 g++-10 gcc-10-plugin-dev gcc-10-multilib gdb lcov \ clang-11 clang-tools-11 libc++1-11 libc++-11-dev \ libc++abi1-11 libc++abi-11-dev libclang1-11 libclang-11-dev \ libclang-common-11-dev libclang-cpp11 libclang-cpp11-dev liblld-11 \ -- cgit v1.2.3 From 90e04d49094c413eeb55483c62434e11ee0cd888 Mon Sep 17 00:00:00 2001 From: Ruben ten Hove Date: Wed, 28 Oct 2020 11:02:44 +0100 Subject: cache is already removed here --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 511b679c..36f45121 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,8 +45,6 @@ RUN apt-get update && apt-get full-upgrade -y && \ RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 0 RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 0 -RUN rm -rf /var/cache/apt/archives/* - ENV LLVM_CONFIG=llvm-config-11 ENV AFL_SKIP_CPUFREQ=1 -- cgit v1.2.3 From 55dd04132fa89002ca15fe38aa519be754e33539 Mon Sep 17 00:00:00 2001 From: Ruben ten Hove Date: Wed, 28 Oct 2020 11:30:21 +0100 Subject: add afl-dyninst shared libraries --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 36f45121..b881c7c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -61,3 +61,6 @@ RUN export REAL_CXX=g++-10 && export CC=gcc-10 && \ RUN echo 'alias joe="jupp --wordwrap"' >> ~/.bashrc RUN echo 'export PS1="[afl++]$PS1"' >> ~/.bashrc ENV IS_DOCKER="1" + +COPY --from=aflplusplus/afl-dyninst /usr/local/lib/libdyninstAPI_RT.so /usr/local/lib/libdyninstAPI_RT.so +COPY --from=aflplusplus/afl-dyninst /afl-dyninst/libAflDyninst.so /usr/local/lib/libAflDyninst.so -- cgit v1.2.3 From 17c0d928e89568430c6e53c1a0936f3bc28a8a25 Mon Sep 17 00:00:00 2001 From: van Hauser Date: Wed, 28 Oct 2020 17:09:30 +0100 Subject: disable afl-dyninst libs until it's container is ready --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index b881c7c8..c8e09b66 100644 --- a/Dockerfile +++ b/Dockerfile @@ -62,5 +62,6 @@ RUN echo 'alias joe="jupp --wordwrap"' >> ~/.bashrc RUN echo 'export PS1="[afl++]$PS1"' >> ~/.bashrc ENV IS_DOCKER="1" -COPY --from=aflplusplus/afl-dyninst /usr/local/lib/libdyninstAPI_RT.so /usr/local/lib/libdyninstAPI_RT.so -COPY --from=aflplusplus/afl-dyninst /afl-dyninst/libAflDyninst.so /usr/local/lib/libAflDyninst.so +# Disabled until we have the container ready +#COPY --from=aflplusplus/afl-dyninst /usr/local/lib/libdyninstAPI_RT.so /usr/local/lib/libdyninstAPI_RT.so +#COPY --from=aflplusplus/afl-dyninst /afl-dyninst/libAflDyninst.so /usr/local/lib/libAflDyninst.so -- cgit v1.2.3