File tree Expand file tree Collapse file tree 3 files changed +12
-16
lines changed
scripts/docker/buildpack-deps Expand file tree Collapse file tree 3 files changed +12
-16
lines changed Original file line number Diff line number Diff line change 2222# (c) 2016-2021 solidity contributors.
2323# ------------------------------------------------------------------------------
2424FROM gcr.io/oss-fuzz-base/base-builder AS base
25- LABEL version="11 "
25+ LABEL version="12 "
2626
2727ARG DEBIAN_FRONTEND=noninteractive
2828
@@ -64,10 +64,6 @@ RUN apt-get update; \
6464 requests \
6565 tabulate;
6666
67- # Ensure that the expected version of Clang is installed, as the base image may update it in the future:
68- # https://github.com/google/oss-fuzz/blob/5e96edbdf285045cc82dbca5600cbe994a3b1a74/infra/base-images/base-clang/checkout_build_install_llvm.sh#L57
69- RUN test "$(clang -dumpversion | cut -d. -f1)" = "18" || (echo "Error: Clang 18 not found!" && exit 1)
70-
7167FROM base AS libraries
7268
7369# Boost
@@ -78,8 +74,8 @@ RUN set -ex; \
7874 tar -xf boost.tar.bz2; \
7975 rm boost.tar.bz2; \
8076 cd boost_1_83_0; \
81- export CXXFLAGS="-std=c++20 -nostdinc++ -I/usr/lib/llvm-18/ include/c++/v1 -pthread" ; \
82- export LDFLAGS="-stdlib=libc++ -L/usr/lib/llvm-18/lib " ; \
77+ 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" ; \
78+ export LDFLAGS="$LDFLAGS -stdlib=libc++ -lpthread " ; \
8379 ./bootstrap.sh --with-toolset=clang --prefix=/usr; \
8480 ./b2 toolset=clang \
8581 cxxflags="${CXXFLAGS}" \
@@ -143,7 +139,7 @@ RUN set -ex; \
143139# EVMONE
144140RUN set -ex; \
145141 cd /usr/src; \
146- git clone --branch="v0.13 .0" --recurse-submodules https://github.com/ipsilon/evmone.git; \
142+ git clone --branch="v0.16 .0" --recurse-submodules https://github.com/ipsilon/evmone.git; \
147143 cd evmone; \
148144 mkdir build; \
149145 cd build; \
Original file line number Diff line number Diff line change 2222# (c) 2016-2024 solidity contributors.
2323# ------------------------------------------------------------------------------
2424FROM buildpack-deps:noble AS base
25- LABEL version="5 "
25+ LABEL version="6 "
2626
2727ARG DEBIAN_FRONTEND=noninteractive
2828
2929# From Python3.11, pip requires a virtual environment, and will thus terminate when installing packages globally.
3030# Since we're building this image from scratch, it's perfectly fine to use the below flag.
31- ENV PIP_BREAK_SYSTEM_PACKAGES 1
31+ ENV PIP_BREAK_SYSTEM_PACKAGES= 1
3232
3333RUN set -ex; \
3434 z3_version="4.13.3" ; \
@@ -89,8 +89,8 @@ FROM base AS libraries
8989
9090# EVMONE
9191RUN set -ex; \
92- 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; \
93- test "$(sha256sum /usr/src/evmone.tar.gz)" = "94efc7fa27ff94018003ad95a62c20b17a45f027d434eb642c8e345e8d4d3cad /usr/src/evmone.tar.gz" ; \
92+ 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; \
93+ test "$(sha256sum /usr/src/evmone.tar.gz)" = "09a59e07bde21bbf08b821db9097ef4db9ff06f1484b7b14497a16a701e72233 /usr/src/evmone.tar.gz" ; \
9494 cd /usr; \
9595 tar -xf /usr/src/evmone.tar.gz; \
9696 rm -rf /usr/src/evmone.tar.gz
Original file line number Diff line number Diff line change 2222# (c) 2016-2024 solidity contributors.
2323# ------------------------------------------------------------------------------
2424FROM buildpack-deps:noble AS base
25- LABEL version="6 "
25+ LABEL version="7 "
2626
2727ARG DEBIAN_FRONTEND=noninteractive
2828
2929# From Python3.11, pip requires a virtual environment, and will thus terminate when installing packages globally.
3030# Since we're building this image from scratch, it's perfectly fine to use the below flag.
31- ENV PIP_BREAK_SYSTEM_PACKAGES 1
31+ ENV PIP_BREAK_SYSTEM_PACKAGES= 1
3232
3333RUN set -ex; \
3434 z3_version="4.13.3" ; \
@@ -91,8 +91,8 @@ ENV CXX clang++
9191
9292# EVMONE
9393RUN set -ex; \
94- 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; \
95- test "$(sha256sum /usr/src/evmone.tar.gz)" = "94efc7fa27ff94018003ad95a62c20b17a45f027d434eb642c8e345e8d4d3cad /usr/src/evmone.tar.gz" ; \
94+ 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; \
95+ test "$(sha256sum /usr/src/evmone.tar.gz)" = "09a59e07bde21bbf08b821db9097ef4db9ff06f1484b7b14497a16a701e72233 /usr/src/evmone.tar.gz" ; \
9696 cd /usr; \
9797 tar -xf /usr/src/evmone.tar.gz; \
9898 rm -rf /usr/src/evmone.tar.gz
You can’t perform that action at this time.
0 commit comments