From 15474a5d092d9c8b597479ca7e518db41d272b6a Mon Sep 17 00:00:00 2001 From: r0qs Date: Fri, 26 Apr 2024 14:17:41 +0200 Subject: [PATCH] Install python dependencies on buildpack-deps images --- scripts/docker/buildpack-deps/Dockerfile.emscripten | 3 ++- .../buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz | 9 +++++---- scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 | 5 +++-- scripts/docker/buildpack-deps/Dockerfile.ubuntu2204 | 5 +++-- .../docker/buildpack-deps/Dockerfile.ubuntu2204.clang | 6 ++++-- 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/scripts/docker/buildpack-deps/Dockerfile.emscripten b/scripts/docker/buildpack-deps/Dockerfile.emscripten index c29fc699ac01..5dbc0d99ddfc 100644 --- a/scripts/docker/buildpack-deps/Dockerfile.emscripten +++ b/scripts/docker/buildpack-deps/Dockerfile.emscripten @@ -39,7 +39,8 @@ ADD emscripten.jam /usr/src RUN set -ex && \ \ apt-get update && \ - apt-get install lz4 sudo --no-install-recommends && \ + apt-get install lz4 sudo lsof python3 python3-pip --no-install-recommends && \ + pip3 install requests && \ \ cd /usr/src && \ git clone https://github.com/Z3Prover/z3.git -b z3-4.12.1 --depth 1 && \ diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz b/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz index 0b2a99b1a299..26f2b80077d9 100644 --- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz +++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz @@ -29,12 +29,13 @@ ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update; \ apt-get -qqy install --no-install-recommends \ automake libtool bison texinfo \ - build-essential sudo \ + build-essential sudo lsof \ software-properties-common \ - ninja-build git wget \ - libbz2-dev zlib1g-dev git curl uuid-dev \ + ninja-build git wget python3-pip \ + libbz2-dev zlib1g-dev curl uuid-dev \ pkg-config openjdk-8-jdk liblzma-dev unzip mlton m4 jq; \ - apt-get install -qy python3-pip; + pip3 install codecov parsec tabulate pylint z3-solver \ + pygments-lexer-solidity deepdiff colorama requests; # Install cmake 3.21.2 (minimum requirement is cmake 3.10) RUN wget https://github.com/Kitware/CMake/releases/download/v3.21.2/cmake-3.21.2-Linux-x86_64.sh; \ diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 index 45490291a9c6..286ec8f3d4c4 100644 --- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 +++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 @@ -34,13 +34,14 @@ RUN set -ex; \ apt-get install -qqy --no-install-recommends \ build-essential sudo \ software-properties-common \ - cmake ninja-build \ + cmake ninja-build lsof \ libboost-filesystem-dev libboost-test-dev libboost-system-dev \ libboost-program-options-dev \ libcvc4-dev libz3-static-dev z3-static jq \ ; \ apt-get install -qy python3-pip python3-sphinx; \ - pip3 install codecov; + pip3 install codecov parsec tabulate pylint z3-solver \ + pygments-lexer-solidity deepdiff colorama requests; # Eldarica RUN set -ex; \ diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204 index d7b92544863c..ae712ce7f01e 100644 --- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204 +++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204 @@ -34,13 +34,14 @@ RUN set -ex; \ apt-get install -qqy --no-install-recommends \ build-essential sudo \ software-properties-common \ - cmake ninja-build \ + cmake ninja-build lsof \ libboost-filesystem-dev libboost-test-dev libboost-system-dev \ libboost-program-options-dev \ libcvc4-dev libz3-static-dev z3-static jq \ libcln-dev zip locales-all; \ apt-get install -qy python3-pip python3-sphinx; \ - pip3 install codecov; + pip3 install codecov parsec tabulate pylint z3-solver \ + pygments-lexer-solidity deepdiff colorama requests; # Eldarica RUN set -ex; \ diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang index 60d5a599c32e..c3d742f54309 100644 --- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang +++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang @@ -34,12 +34,14 @@ RUN set -ex; \ apt-get install -qqy --no-install-recommends \ build-essential sudo \ software-properties-common \ - cmake ninja-build \ + cmake ninja-build lsof \ libboost-filesystem-dev libboost-test-dev libboost-system-dev \ libboost-program-options-dev \ clang \ libz3-static-dev z3-static jq \ - libcln-dev; + libcln-dev python3-pip; \ + pip3 install codecov parsec tabulate pylint z3-solver \ + pygments-lexer-solidity deepdiff colorama requests; # Eldarica RUN set -ex; \