Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Install python dependencies on buildpack-deps images #15059

Merged
merged 3 commits into from
Apr 26, 2024
Merged

Install python dependencies on buildpack-deps images #15059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
351a910
Install python dependencies on buildpack-deps images
r0qs Apr 26, 2024
700ba0b
Sort packages in alphabetical order and split commands by line
r0qs Apr 26, 2024
9cbd0a1
Remove superfluous cleanup step
r0qs Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions scripts/docker/buildpack-deps/Dockerfile.emscripten
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
44 changes: 33 additions & 11 deletions scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand Down Expand Up @@ -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
Expand Down
43 changes: 29 additions & 14 deletions scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
46 changes: 32 additions & 14 deletions scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
42 changes: 29 additions & 13 deletions scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down