Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 4 additions & 8 deletions scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# (c) 2016-2021 solidity contributors.
#------------------------------------------------------------------------------
FROM gcr.io/oss-fuzz-base/base-builder AS base
LABEL version="11"
LABEL version="12"

ARG DEBIAN_FRONTEND=noninteractive

Expand Down Expand Up @@ -64,10 +64,6 @@ RUN apt-get update; \
requests \
tabulate;

# Ensure that the expected version of Clang is installed, as the base image may update it in the future:
# https://github.com/google/oss-fuzz/blob/5e96edbdf285045cc82dbca5600cbe994a3b1a74/infra/base-images/base-clang/checkout_build_install_llvm.sh#L57
RUN test "$(clang -dumpversion | cut -d. -f1)" = "18" || (echo "Error: Clang 18 not found!" && exit 1)

FROM base AS libraries

# Boost
Expand All @@ -78,8 +74,8 @@ RUN set -ex; \
tar -xf boost.tar.bz2; \
rm boost.tar.bz2; \
cd boost_1_83_0; \
export CXXFLAGS="-std=c++20 -nostdinc++ -I/usr/lib/llvm-18/include/c++/v1 -pthread"; \
export LDFLAGS="-stdlib=libc++ -L/usr/lib/llvm-18/lib"; \
export CXXFLAGS="$CXXFLAGS -std=c++20 -nostdinc++ -I/usr/local/include/c++/v1 -I/usr/local/include/x86_64-unknown-linux-gnu/c++/v1 -pthread"; \
export LDFLAGS="$LDFLAGS -stdlib=libc++ -lpthread"; \
./bootstrap.sh --with-toolset=clang --prefix=/usr; \
./b2 toolset=clang \
cxxflags="${CXXFLAGS}" \
Expand Down Expand Up @@ -143,7 +139,7 @@ RUN set -ex; \
# EVMONE
RUN set -ex; \
cd /usr/src; \
git clone --branch="v0.13.0" --recurse-submodules https://github.com/ipsilon/evmone.git; \
git clone --branch="v0.16.0" --recurse-submodules https://github.com/ipsilon/evmone.git; \
cd evmone; \
mkdir build; \
cd build; \
Expand Down
8 changes: 4 additions & 4 deletions scripts/docker/buildpack-deps/Dockerfile.ubuntu2404
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
# (c) 2016-2024 solidity contributors.
#------------------------------------------------------------------------------
FROM buildpack-deps:noble AS base
LABEL version="5"
LABEL version="6"

ARG DEBIAN_FRONTEND=noninteractive

# From Python3.11, pip requires a virtual environment, and will thus terminate when installing packages globally.
# Since we're building this image from scratch, it's perfectly fine to use the below flag.
ENV PIP_BREAK_SYSTEM_PACKAGES 1
ENV PIP_BREAK_SYSTEM_PACKAGES=1

RUN set -ex; \
z3_version="4.13.3"; \
Expand Down Expand Up @@ -89,8 +89,8 @@ FROM base AS libraries

# EVMONE
RUN set -ex; \
wget -O /usr/src/evmone.tar.gz https://github.com/ipsilon/evmone/releases/download/v0.13.0/evmone-0.13.0-linux-x86_64.tar.gz; \
test "$(sha256sum /usr/src/evmone.tar.gz)" = "94efc7fa27ff94018003ad95a62c20b17a45f027d434eb642c8e345e8d4d3cad /usr/src/evmone.tar.gz"; \
wget -O /usr/src/evmone.tar.gz https://github.com/ipsilon/evmone/releases/download/v0.16.0/evmone-0.16.0-linux-x86_64.tar.gz; \
test "$(sha256sum /usr/src/evmone.tar.gz)" = "09a59e07bde21bbf08b821db9097ef4db9ff06f1484b7b14497a16a701e72233 /usr/src/evmone.tar.gz"; \
cd /usr; \
tar -xf /usr/src/evmone.tar.gz; \
rm -rf /usr/src/evmone.tar.gz
Expand Down
8 changes: 4 additions & 4 deletions scripts/docker/buildpack-deps/Dockerfile.ubuntu2404.clang
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
# (c) 2016-2024 solidity contributors.
#------------------------------------------------------------------------------
FROM buildpack-deps:noble AS base
LABEL version="6"
LABEL version="7"

ARG DEBIAN_FRONTEND=noninteractive

# From Python3.11, pip requires a virtual environment, and will thus terminate when installing packages globally.
# Since we're building this image from scratch, it's perfectly fine to use the below flag.
ENV PIP_BREAK_SYSTEM_PACKAGES 1
ENV PIP_BREAK_SYSTEM_PACKAGES=1

RUN set -ex; \
z3_version="4.13.3"; \
Expand Down Expand Up @@ -91,8 +91,8 @@ ENV CXX clang++

# EVMONE
RUN set -ex; \
wget -O /usr/src/evmone.tar.gz https://github.com/ipsilon/evmone/releases/download/v0.13.0/evmone-0.13.0-linux-x86_64.tar.gz; \
test "$(sha256sum /usr/src/evmone.tar.gz)" = "94efc7fa27ff94018003ad95a62c20b17a45f027d434eb642c8e345e8d4d3cad /usr/src/evmone.tar.gz"; \
wget -O /usr/src/evmone.tar.gz https://github.com/ipsilon/evmone/releases/download/v0.16.0/evmone-0.16.0-linux-x86_64.tar.gz; \
test "$(sha256sum /usr/src/evmone.tar.gz)" = "09a59e07bde21bbf08b821db9097ef4db9ff06f1484b7b14497a16a701e72233 /usr/src/evmone.tar.gz"; \
cd /usr; \
tar -xf /usr/src/evmone.tar.gz; \
rm -rf /usr/src/evmone.tar.gz
Expand Down