Merge pull request #15059 from ethereum/add-python-pkgs-buildpack-deps

Install python dependencies on buildpack-deps images
ethereum · Apr 26, 2024 · 7f88baa · 7f88baa
2 parents 9e4d260 + 9cbd0a1
commit 7f88baa
Show file tree

Hide file tree

Showing 5 changed files with 131 additions and 55 deletions.
diff --git a/scripts/docker/buildpack-deps/Dockerfile.emscripten b/scripts/docker/buildpack-deps/Dockerfile.emscripten
@@ -33,13 +33,18 @@
 # Using $(em-config CACHE)/sysroot/usr seems to work, though, and still has cmake find the
 # dependencies automatically.
 FROM emscripten/emsdk:3.1.19 AS base
-LABEL version="16"
+LABEL version="17"
 
 ADD emscripten.jam /usr/src
 RUN set -ex && \
-	\
 	apt-get update && \
-	apt-get install lz4 sudo --no-install-recommends && \
+	apt-get install -qqy --no-install-recommends \
+		lsof \
+		lz4 \
+		python3 \
+		python3-pip \
+		sudo && \
+	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
@@ -22,19 +22,45 @@
 # (c) 2016-2021 solidity contributors.
 #------------------------------------------------------------------------------
 FROM gcr.io/oss-fuzz-base/base-clang:latest as base
-LABEL version="5"
+LABEL version="6"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update; \
 	apt-get -qqy install --no-install-recommends \
-		automake libtool bison texinfo \
-		build-essential sudo \
+		automake \
+		bison \
+		build-essential \
+		curl \
+		git \
+		jq \
+		libbz2-dev \
+		liblzma-dev \
+		libtool \
+		lsof \
+		m4 \
+		mlton \
+		ninja-build \
+		openjdk-8-jdk \
+		pkg-config \
+		python3-pip \
 		software-properties-common \
-		ninja-build git wget \
-		libbz2-dev zlib1g-dev git curl uuid-dev \
-		pkg-config openjdk-8-jdk liblzma-dev unzip mlton m4 jq; \
-    apt-get install -qy python3-pip;
+		sudo \
+		texinfo \
+		unzip \
+		uuid-dev \
+		wget \
+		zlib1g-dev; \
+	pip3 install \
+		codecov \
+		colorama \
+		deepdiff \
+		parsec \
+		pygments-lexer-solidity \
+		pylint \
+		requests \
+		tabulate \
+		z3-solver;
 
 # 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; \
@@ -147,10 +173,6 @@ RUN set -ex; \
     cp abicoder.hpp /usr/include; \
     rm -rf /usr/src/Yul-Isabelle
 
-# Cleanup
-RUN set -ex; \
-	rm -rf /var/lib/apt/lists/*
-
 FROM base
 COPY --from=libraries /usr/lib /usr/lib
 COPY --from=libraries /usr/bin /usr/bin

diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:focal AS base
-LABEL version="22"
+LABEL version="23"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -32,30 +32,45 @@ RUN set -ex; \
 	apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1c52189c923f6ca9 ; \
 	apt-get update; \
 	apt-get install -qqy --no-install-recommends \
-		build-essential sudo \
-		software-properties-common \
-		cmake ninja-build \
-		libboost-filesystem-dev libboost-test-dev libboost-system-dev \
+		build-essential \
+		cmake \
+		jq \
+		libboost-filesystem-dev \
 		libboost-program-options-dev \
-		libcvc4-dev libz3-static-dev z3-static jq \
-		; \
-	apt-get install -qy python3-pip python3-sphinx; \
-	pip3 install codecov;
+		libboost-system-dev \
+		libboost-test-dev \
+		libcvc4-dev \
+		libz3-static-dev \
+		lsof \
+		ninja-build \
+		python3-pip \
+		python3-sphinx \
+		software-properties-common \
+		sudo \
+		z3-static; \
+	pip3 install \
+		codecov \
+		colorama \
+		deepdiff \
+		parsec \
+		pygments-lexer-solidity \
+		pylint \
+		requests \
+		tabulate \
+		z3-solver;
 
 # Eldarica
 RUN set -ex; \
 	apt-get update; \
-	apt-get install -qy unzip openjdk-11-jre; \
+	apt-get install -qqy \
+		openjdk-11-jre \
+		unzip; \
 	eldarica_version="2.1"; \
 	wget "https://github.com/uuverifiers/eldarica/releases/download/v${eldarica_version}/eldarica-bin-${eldarica_version}.zip" -O /opt/eld_binaries.zip; \
 	test "$(sha256sum /opt/eld_binaries.zip)" = "0ac43f45c0925383c9d2077f62bbb515fd792375f3b2b101b30c9e81dcd7785c  /opt/eld_binaries.zip"; \
 	unzip /opt/eld_binaries.zip -d /opt; \
 	rm -f /opt/eld_binaries.zip;
 
-# Cleanup
-RUN set -ex; \
-	rm -rf /var/lib/apt/lists/*
-
 FROM base AS libraries
 
 # EVMONE

diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:jammy AS base
-LABEL version="7"
+LABEL version="8"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -32,30 +32,48 @@ RUN set -ex; \
 	apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1c52189c923f6ca9 ; \
 	apt-get update; \
 	apt-get install -qqy --no-install-recommends \
-		build-essential sudo \
-		software-properties-common \
-		cmake ninja-build \
-		libboost-filesystem-dev libboost-test-dev libboost-system-dev \
+		build-essential \
+		cmake \
+		jq \
+		libboost-filesystem-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;
+		libboost-system-dev \
+		libboost-test-dev \
+		libcln-dev \
+		libcvc4-dev \
+		libz3-static-dev \
+		locales-all \
+		lsof \
+		ninja-build \
+		python3-pip \
+		python3-sphinx \
+		software-properties-common \
+		sudo \
+		z3-static \
+		zip; \
+	pip3 install \
+		codecov \
+		colorama \
+		deepdiff \
+		parsec \
+		pygments-lexer-solidity \
+		pylint \
+		requests \
+		tabulate \
+		z3-solver;
 
 # Eldarica
 RUN set -ex; \
 	apt-get update; \
-	apt-get install -qy unzip openjdk-11-jre; \
+	apt-get install -qqy \
+		openjdk-11-jre \
+		unzip; \
 	eldarica_version="2.1"; \
 	wget "https://github.com/uuverifiers/eldarica/releases/download/v${eldarica_version}/eldarica-bin-${eldarica_version}.zip" -O /opt/eld_binaries.zip; \
 	test "$(sha256sum /opt/eld_binaries.zip)" = "0ac43f45c0925383c9d2077f62bbb515fd792375f3b2b101b30c9e81dcd7785c  /opt/eld_binaries.zip"; \
 	unzip /opt/eld_binaries.zip -d /opt; \
 	rm -f /opt/eld_binaries.zip;
 
-# Cleanup
-RUN set -ex; \
-	rm -rf /var/lib/apt/lists/*
-
 FROM base AS libraries
 
 # EVMONE

diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:jammy AS base
-LABEL version="6"
+LABEL version="7"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -32,29 +32,45 @@ RUN set -ex; \
 	apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1c52189c923f6ca9 ; \
 	apt-get update; \
 	apt-get install -qqy --no-install-recommends \
-		build-essential sudo \
-		software-properties-common \
-		cmake ninja-build \
-		libboost-filesystem-dev libboost-test-dev libboost-system-dev \
-		libboost-program-options-dev \
+		build-essential \
 		clang \
-		libz3-static-dev z3-static jq \
-		libcln-dev;
+		cmake \
+		jq \
+		lsof \
+		libboost-filesystem-dev \
+		libboost-program-options-dev \
+		libboost-system-dev \
+		libboost-test-dev \
+		libcln-dev \
+		libz3-static-dev \
+		ninja-build \
+		python3-pip \
+		software-properties-common \
+		sudo \
+		z3-static; \
+	pip3 install \
+		codecov \
+		colorama \
+		deepdiff \
+		parsec \
+		pygments-lexer-solidity \
+		pylint \
+		requests \
+		tabulate \
+		z3-solver;
 
 # Eldarica
 RUN set -ex; \
 	apt-get update; \
-	apt-get install -qy unzip openjdk-11-jre; \
+	apt-get install -qy \
+		openjdk-11-jre \
+		unzip; \
 	eldarica_version="2.1"; \
 	wget "https://github.com/uuverifiers/eldarica/releases/download/v${eldarica_version}/eldarica-bin-${eldarica_version}.zip" -O /opt/eld_binaries.zip; \
 	test "$(sha256sum /opt/eld_binaries.zip)" = "0ac43f45c0925383c9d2077f62bbb515fd792375f3b2b101b30c9e81dcd7785c  /opt/eld_binaries.zip"; \
 	unzip /opt/eld_binaries.zip -d /opt; \
 	rm -f /opt/eld_binaries.zip;
 
-# Cleanup
-RUN set -ex; \
-	rm -rf /var/lib/apt/lists/*
-
 FROM base AS libraries
 
 ENV CC clang