diff options
| author | van Hauser <vh@thc.org> | 2022-01-30 20:55:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-30 20:55:55 +0100 |
| commit | 267dd634f141b2968cafef620d75c10681fb5ab9 (patch) | |
| tree | 9e96e0ebbac070c777f3d931680bc0d47bcb212c | |
| parent | 59a7337bf14b53ba970b6362d911c196f22e3b5e (diff) | |
| parent | 7ab7862e4db75024cae98aecdc79d9247db355e7 (diff) | |
| download | afl++-267dd634f141b2968cafef620d75c10681fb5ab9.tar.gz | |
Merge pull request #1318 from moyix/stable
Build docker images for arm64 as well as x86.
| -rw-r--r-- | .github/workflows/build_aflplusplus_docker.yaml | 5 | ||||
| -rw-r--r-- | CITATION.cff | 31 | ||||
| -rw-r--r-- | Dockerfile | 13 |
3 files changed, 46 insertions, 3 deletions
diff --git a/.github/workflows/build_aflplusplus_docker.yaml b/.github/workflows/build_aflplusplus_docker.yaml index 8aa5b8f7..fa96da8e 100644 --- a/.github/workflows/build_aflplusplus_docker.yaml +++ b/.github/workflows/build_aflplusplus_docker.yaml @@ -12,6 +12,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@master + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 - name: Login to Dockerhub uses: docker/login-action@v1 with: @@ -21,5 +25,6 @@ jobs: uses: docker/build-push-action@v2 with: context: . + platforms: linux/amd64,linux/arm64 push: true tags: aflplusplus/aflplusplus:latest diff --git a/CITATION.cff b/CITATION.cff new file mode 100644 index 00000000..efd6cad8 --- /dev/null +++ b/CITATION.cff @@ -0,0 +1,31 @@ +cff-version: 1.2.0 +message: "If you use this software, please cite it as below." +authors: + - given-names: Marc + family-names: Heuse + email: mh@mh-sec.de + - given-names: Heiko + family-names: Eißfeldt + email: heiko.eissfeldt@hexco.de + - given-names: Andrea + family-names: Fioraldi + email: andreafioraldi@gmail.com + - given-names: Dominik + family-names: Meier + email: mail@dmnk.co +title: "AFL++" +version: 3.14 +type: software +date-released: 2021-07-19 +url: "https://github.com/AFLplusplus/AFLplusplus" +keywords: + - fuzzing + - fuzzer + - fuzz-testing + - instrumentation + - afl-fuzz + - qemu + - llvm + - unicorn-emulator + - securiy +license: AGPL-3.0-or-later diff --git a/Dockerfile b/Dockerfile index a3c70746..53189657 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,13 +39,20 @@ 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 gcc-multilib gdb lcov \ + gcc-10 g++-10 gcc-10-plugin-dev gdb lcov \ clang-12 clang-tools-12 libc++1-12 libc++-12-dev \ libc++abi1-12 libc++abi-12-dev libclang1-12 libclang-12-dev \ libclang-common-12-dev libclang-cpp12 libclang-cpp12-dev liblld-12 \ liblld-12-dev liblldb-12 liblldb-12-dev libllvm12 libomp-12-dev \ - libomp5-12 lld-12 lldb-12 llvm-12 llvm-12-dev llvm-12-runtime llvm-12-tools \ - && rm -rf /var/lib/apt/lists/* + libomp5-12 lld-12 lldb-12 llvm-12 llvm-12-dev llvm-12-runtime llvm-12-tools + +# arm64 doesn't have gcc-multilib, and it's only used for -m32 support on x86 +ARG TARGETPLATFORM +RUN [ "$TARGETPLATFORM" = "linux/amd64" ] && \ + apt-get -y install --no-install-suggests --no-install-recommends \ + gcc-10-multilib gcc-multilib || true + +RUN 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 |