Skip to content

Commit 43c2b38

Browse files
blishkoblishko
committed
Docker: Update Z3 and cvc5 versions
1 parent 15bed58 commit 43c2b38

File tree

5 files changed

+70
-57
lines changed

5 files changed

+70
-57
lines changed

‎scripts/docker/buildpack-deps/Dockerfile.emscripten

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
# Using $(em-config CACHE)/sysroot/usr seems to work, though, and still has cmake find the
3434
# dependencies automatically.
3535
FROM emscripten/emsdk:3.1.19 AS base
36-
LABEL version="18"
36+
LABEL version="19"
3737

3838
ADD emscripten.jam /usr/src
3939
RUN set -ex && \
@@ -49,7 +49,7 @@ RUN set -ex && \
4949
# Install Z3
5050
RUN set -ex && \
5151
cd /usr/src && \
52-
git clone https://github.com/Z3Prover/z3.git -b z3-4.12.1 --depth 1 && \
52+
git clone https://github.com/Z3Prover/z3.git -b z3-4.13.3 --depth 1 && \
5353
cd z3 && \
5454
mkdir build && \
5555
cd build && \
@@ -86,11 +86,9 @@ RUN set -ex && \
8686

8787
# CVC5
8888
RUN set -ex; \
89-
cvc5_version="1.1.2"; \
90-
wget "https://github.com/cvc5/cvc5/releases/download/cvc5-${cvc5_version}/cvc5-Linux-static.zip" -O /opt/cvc5.zip; \
91-
test "$(sha256sum /opt/cvc5.zip)" = "cf291aef67da8eaa8d425a51f67f3f72f36db8b1040655dc799b64e3d69e6086 /opt/cvc5.zip"; \
92-
unzip /opt/cvc5.zip -x "cvc5-Linux-static/lib/cmake/*" -d /opt; \
93-
mv /opt/cvc5-Linux-static/bin/* /usr/bin; \
94-
mv /opt/cvc5-Linux-static/include/* /usr/include; \
95-
mv /opt/cvc5-Linux-static/lib/* /usr/lib; \
96-
rm -rf /opt/cvc5-Linux-static /opt/cvc5.zip;
89+
cvc5_version="1.2.0"; \
90+
cvc5_archive_name="cvc5-Linux-x86_64-static"; \
91+
wget "https://github.com/cvc5/cvc5/releases/download/cvc5-${cvc5_version}/${cvc5_archive_name}.zip" -O /opt/cvc5.zip; \
92+
test "$(sha256sum /opt/cvc5.zip)" = "d18f174ff9a11923c32c3f871f844ed16bd77a28f51050b8e7c8d821c98a1c2e /opt/cvc5.zip"; \
93+
unzip -j /opt/cvc5.zip "${cvc5_archive_name}/bin/cvc5" -d /usr/bin; \
94+
rm -f /opt/cvc5.zip;

‎scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# (c) 2016-2021 solidity contributors.
2323
#------------------------------------------------------------------------------
2424
FROM gcr.io/oss-fuzz-base/base-clang:latest as base
25-
LABEL version="7"
25+
LABEL version="8"
2626

2727
ARG DEBIAN_FRONTEND=noninteractive
2828

@@ -60,7 +60,7 @@ RUN apt-get update; \
6060
pylint \
6161
requests \
6262
tabulate \
63-
z3-solver;
63+
z3-solver;
6464

6565
# Install cmake 3.21.2 (minimum requirement is cmake 3.10)
6666
RUN wget https://github.com/Kitware/CMake/releases/download/v3.21.2/cmake-3.21.2-Linux-x86_64.sh; \
@@ -88,14 +88,14 @@ RUN set -ex; \
8888

8989
# Z3
9090
RUN set -ex; \
91-
git clone --depth 1 -b z3-4.12.1 https://github.com/Z3Prover/z3.git \
91+
git clone --depth 1 -b z3-4.13.3 https://github.com/Z3Prover/z3.git \
9292
/usr/src/z3; \
9393
cd /usr/src/z3; \
9494
mkdir build; \
9595
cd build; \
9696
LDFLAGS=$CXXFLAGS cmake -DZ3_BUILD_LIBZ3_SHARED=OFF -DCMAKE_INSTALL_PREFIX=/usr \
9797
-DCMAKE_BUILD_TYPE=Release ..; \
98-
make libz3 -j; \
98+
make z3 -j; \
9999
make install; \
100100
rm -rf /usr/src/z3
101101

@@ -111,14 +111,14 @@ RUN set -ex; \
111111

112112
# CVC5
113113
RUN set -ex; \
114-
cvc5_version="1.1.2"; \
115-
wget "https://github.com/cvc5/cvc5/releases/download/cvc5-${cvc5_version}/cvc5-Linux-static.zip" -O /opt/cvc5.zip; \
116-
test "$(sha256sum /opt/cvc5.zip)" = "cf291aef67da8eaa8d425a51f67f3f72f36db8b1040655dc799b64e3d69e6086 /opt/cvc5.zip"; \
117-
unzip /opt/cvc5.zip -x "cvc5-Linux-static/lib/cmake/*" -d /opt; \
118-
mv /opt/cvc5-Linux-static/bin/* /usr/bin; \
119-
mv /opt/cvc5-Linux-static/include/* /usr/include; \
120-
mv /opt/cvc5-Linux-static/lib/* /usr/lib; \
121-
rm -rf /opt/cvc5-Linux-static /opt/cvc5.zip;
114+
cvc5_version="1.2.0"; \
115+
wget "https://github.com/cvc5/cvc5/releases/download/cvc5-${cvc5_version}/cvc5-Linux-x86_64-static.zip" -O /opt/cvc5.zip; \
116+
test "$(sha256sum /opt/cvc5.zip)" = "d18f174ff9a11923c32c3f871f844ed16bd77a28f51050b8e7c8d821c98a1c2e /opt/cvc5.zip"; \
117+
unzip /opt/cvc5.zip -x "cvc5-Linux-x86_64-static/lib/cmake/*" -d /opt; \
118+
mv /opt/cvc5-Linux-x86_64-static/bin/* /usr/bin; \
119+
mv /opt/cvc5-Linux-x86_64-static/include/* /usr/include; \
120+
mv /opt/cvc5-Linux-x86_64-static/lib/* /usr/lib; \
121+
rm -rf /opt/cvc5-Linux-x86_64-static /opt/cvc5.zip;
122122

123123
# OSSFUZZ: libprotobuf-mutator
124124
RUN set -ex; \

‎scripts/docker/buildpack-deps/Dockerfile.ubuntu2004

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# (c) 2016-2019 solidity contributors.
2323
#------------------------------------------------------------------------------
2424
FROM buildpack-deps:focal AS base
25-
LABEL version="25"
25+
LABEL version="26"
2626

2727
ARG DEBIAN_FRONTEND=noninteractive
2828

@@ -39,15 +39,13 @@ RUN set -ex; \
3939
libboost-program-options-dev \
4040
libboost-system-dev \
4141
libboost-test-dev \
42-
libz3-static-dev \
4342
lsof \
4443
ninja-build \
4544
python3-pip \
4645
python3-sphinx \
4746
software-properties-common \
4847
sudo \
49-
unzip \
50-
z3-static; \
48+
unzip; \
5149
pip3 install \
5250
codecov \
5351
colorama \
@@ -76,14 +74,21 @@ RUN set -ex; \
7674

7775
# CVC5
7876
RUN set -ex; \
79-
cvc5_version="1.1.2"; \
80-
wget "https://github.com/cvc5/cvc5/releases/download/cvc5-${cvc5_version}/cvc5-Linux-static.zip" -O /opt/cvc5.zip; \
81-
test "$(sha256sum /opt/cvc5.zip)" = "cf291aef67da8eaa8d425a51f67f3f72f36db8b1040655dc799b64e3d69e6086 /opt/cvc5.zip"; \
82-
unzip /opt/cvc5.zip -x "cvc5-Linux-static/lib/cmake/*" -d /opt; \
83-
mv /opt/cvc5-Linux-static/bin/* /usr/bin; \
84-
mv /opt/cvc5-Linux-static/include/* /usr/include; \
85-
mv /opt/cvc5-Linux-static/lib/* /usr/lib; \
86-
rm -rf /opt/cvc5-Linux-static /opt/cvc5.zip;
77+
cvc5_version="1.2.0"; \
78+
cvc5_archive_name="cvc5-Linux-x86_64-static"; \
79+
wget "https://github.com/cvc5/cvc5/releases/download/cvc5-${cvc5_version}/${cvc5_archive_name}.zip" -O /opt/cvc5.zip; \
80+
test "$(sha256sum /opt/cvc5.zip)" = "d18f174ff9a11923c32c3f871f844ed16bd77a28f51050b8e7c8d821c98a1c2e /opt/cvc5.zip"; \
81+
unzip -j /opt/cvc5.zip "${cvc5_archive_name}/bin/cvc5" -d /usr/bin; \
82+
rm -f /opt/cvc5.zip;
83+
84+
# Z3
85+
RUN set -ex; \
86+
z3_version="4.13.3"; \
87+
z3_archive_name="z3-${z3_version}-x64-glibc-2.35"; \
88+
wget "https://github.com/Z3Prover/z3/releases/download/z3-${z3_version}/${z3_archive_name}.zip" -O /opt/z3.zip; \
89+
test "$(sha256sum /opt/z3.zip)" = "32c7377026733c9d7b33c21cd77a68f50ba682367207b031a6bfd80140a8722f /opt/z3.zip"; \
90+
unzip -j /opt/z3.zip "${z3_archive_name}/bin/z3" -d /usr/bin; \
91+
rm -f /opt/z3.zip;
8792

8893
FROM base AS libraries
8994

‎scripts/docker/buildpack-deps/Dockerfile.ubuntu2404

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# (c) 2016-2024 solidity contributors.
2323
#------------------------------------------------------------------------------
2424
FROM buildpack-deps:noble AS base
25-
LABEL version="1"
25+
LABEL version="2"
2626

2727
ARG DEBIAN_FRONTEND=noninteractive
2828

@@ -44,7 +44,6 @@ RUN set -ex; \
4444
libboost-system-dev \
4545
libboost-test-dev \
4646
libcln-dev \
47-
libz3-static-dev \
4847
locales-all \
4948
lsof \
5049
ninja-build \
@@ -53,7 +52,6 @@ RUN set -ex; \
5352
software-properties-common \
5453
sudo \
5554
unzip \
56-
z3-static \
5755
zip; \
5856
pip3 install \
5957
codecov \
@@ -79,14 +77,21 @@ RUN set -ex; \
7977

8078
# CVC5
8179
RUN set -ex; \
82-
cvc5_version="1.1.2"; \
83-
wget "https://github.com/cvc5/cvc5/releases/download/cvc5-${cvc5_version}/cvc5-Linux-static.zip" -O /opt/cvc5.zip; \
84-
test "$(sha256sum /opt/cvc5.zip)" = "cf291aef67da8eaa8d425a51f67f3f72f36db8b1040655dc799b64e3d69e6086 /opt/cvc5.zip"; \
85-
unzip /opt/cvc5.zip -x "cvc5-Linux-static/lib/cmake/*" -d /opt; \
86-
mv /opt/cvc5-Linux-static/bin/* /usr/bin; \
87-
mv /opt/cvc5-Linux-static/include/* /usr/include; \
88-
mv /opt/cvc5-Linux-static/lib/* /usr/lib; \
89-
rm -rf /opt/cvc5-Linux-static /opt/cvc5.zip;
80+
cvc5_version="1.2.0"; \
81+
cvc5_archive_name="cvc5-Linux-x86_64-static"; \
82+
wget "https://github.com/cvc5/cvc5/releases/download/cvc5-${cvc5_version}/${cvc5_archive_name}.zip" -O /opt/cvc5.zip; \
83+
test "$(sha256sum /opt/cvc5.zip)" = "d18f174ff9a11923c32c3f871f844ed16bd77a28f51050b8e7c8d821c98a1c2e /opt/cvc5.zip"; \
84+
unzip -j /opt/cvc5.zip "${cvc5_archive_name}/bin/cvc5" -d /usr/bin; \
85+
rm -f /opt/cvc5.zip;
86+
87+
# Z3
88+
RUN set -ex; \
89+
z3_version="4.13.3"; \
90+
z3_archive_name="z3-${z3_version}-x64-glibc-2.35"; \
91+
wget "https://github.com/Z3Prover/z3/releases/download/z3-${z3_version}/${z3_archive_name}.zip" -O /opt/z3.zip; \
92+
test "$(sha256sum /opt/z3.zip)" = "32c7377026733c9d7b33c21cd77a68f50ba682367207b031a6bfd80140a8722f /opt/z3.zip"; \
93+
unzip -j /opt/z3.zip "${z3_archive_name}/bin/z3" -d /usr/bin; \
94+
rm -f /opt/z3.zip;
9095

9196
FROM base AS libraries
9297

‎scripts/docker/buildpack-deps/Dockerfile.ubuntu2404.clang

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# (c) 2016-2024 solidity contributors.
2323
#------------------------------------------------------------------------------
2424
FROM buildpack-deps:noble AS base
25-
LABEL version="2"
25+
LABEL version="3"
2626

2727
ARG DEBIAN_FRONTEND=noninteractive
2828

@@ -46,13 +46,11 @@ RUN set -ex; \
4646
libboost-test-dev \
4747
libclang-rt-dev \
4848
libcln-dev \
49-
libz3-static-dev \
5049
lsof \
5150
ninja-build \
5251
python3-pip \
5352
software-properties-common \
54-
sudo \
55-
z3-static; \
53+
sudo; \
5654
pip3 install \
5755
codecov \
5856
colorama \
@@ -78,14 +76,21 @@ RUN set -ex; \
7876

7977
# CVC5
8078
RUN set -ex; \
81-
cvc5_version="1.1.2"; \
82-
wget "https://github.com/cvc5/cvc5/releases/download/cvc5-${cvc5_version}/cvc5-Linux-static.zip" -O /opt/cvc5.zip; \
83-
test "$(sha256sum /opt/cvc5.zip)" = "cf291aef67da8eaa8d425a51f67f3f72f36db8b1040655dc799b64e3d69e6086 /opt/cvc5.zip"; \
84-
unzip /opt/cvc5.zip -x "cvc5-Linux-static/lib/cmake/*" -d /opt; \
85-
mv /opt/cvc5-Linux-static/bin/* /usr/bin; \
86-
mv /opt/cvc5-Linux-static/lib/* /usr/lib; \
87-
mv /opt/cvc5-Linux-static/include/* /usr/include; \
88-
rm -rf /opt/cvc5-Linux-static /opt/cvc5.zip;
79+
cvc5_version="1.2.0"; \
80+
cvc5_archive_name="cvc5-Linux-x86_64-static"; \
81+
wget "https://github.com/cvc5/cvc5/releases/download/cvc5-${cvc5_version}/${cvc5_archive_name}.zip" -O /opt/cvc5.zip; \
82+
test "$(sha256sum /opt/cvc5.zip)" = "d18f174ff9a11923c32c3f871f844ed16bd77a28f51050b8e7c8d821c98a1c2e /opt/cvc5.zip"; \
83+
unzip -j /opt/cvc5.zip "${cvc5_archive_name}/bin/cvc5" -d /usr/bin; \
84+
rm -f /opt/cvc5.zip;
85+
86+
# Z3
87+
RUN set -ex; \
88+
z3_version="4.13.3"; \
89+
z3_archive_name="z3-${z3_version}-x64-glibc-2.35"; \
90+
wget "https://github.com/Z3Prover/z3/releases/download/z3-${z3_version}/${z3_archive_name}.zip" -O /opt/z3.zip; \
91+
test "$(sha256sum /opt/z3.zip)" = "32c7377026733c9d7b33c21cd77a68f50ba682367207b031a6bfd80140a8722f /opt/z3.zip"; \
92+
unzip -j /opt/z3.zip "${z3_archive_name}/bin/z3" -d /usr/bin; \
93+
rm -f /opt/z3.zip;
8994

9095
FROM base AS libraries
9196

0 commit comments

Comments
 (0)