Skip to content

Bump evmone version in docker images to 0.10.0. #14199

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

Merged
ekpyron merged 1 commit into from
May 9, 2023
Merged

Bump evmone version in docker images to 0.10.0. #14199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions ...r/buildpack-deps/Dockerfile.clang.ossfuzz → ...pack-deps/Dockerfile.ubuntu.clang.ossfuzz
View file
Open in desktop
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-clang:latest as base
LABEL version="23"
LABEL version="1"

ARG DEBIAN_FRONTEND=noninteractive

Expand Down Expand Up @@ -93,11 +93,11 @@ RUN set -ex; \
# EVMONE
RUN set -ex; \
cd /usr/src; \
git clone --branch="v0.9.1" --recurse-submodules https://github.com/ethereum/evmone.git; \
git clone --branch="v0.10.0" --recurse-submodules https://github.com/ethereum/evmone.git; \
cd evmone; \
mkdir build; \
cd build; \
cmake -G Ninja -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX="/usr" ..; \
CXX=clang++ cmake -G Ninja -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX="/usr" ..; \
ninja; \
ninja install/strip; \
rm -rf /usr/src/evmone
Expand Down
16 changes: 6 additions & 10 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="18"
LABEL version="19"

ARG DEBIAN_FRONTEND=noninteractive

Expand All @@ -47,15 +47,11 @@ FROM base AS libraries

# EVMONE
RUN set -ex; \
cd /usr/src; \
git clone --branch="v0.9.1" --recurse-submodules https://github.com/ethereum/evmone.git; \
cd evmone; \
mkdir build; \
cd build; \
cmake -G Ninja -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX="/usr" ..; \
ninja; \
ninja install/strip; \
rm -rf /usr/src/evmone
wget -O /usr/src/evmone.tar.gz https://github.com/ethereum/evmone/releases/download/v0.10.0/evmone-0.10.0-linux-x86_64.tar.gz; \
Copy link
Member

@r0qs r0qs May 9, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why for this image you decided to not build from the source?

Copy link
Collaborator Author

@ekpyron ekpyron May 9, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because evmone switched to requiring C++20, which ubuntu 20.04 does not have a suitably capable compiler for.

test "$(sha256sum /usr/src/evmone.tar.gz)" = "6052b6a4eba6e81bb1bccfa9fec2caf220a25f5ff5c32c544984883ed95e6552 /usr/src/evmone.tar.gz"; \
cd /usr; \
tar -xf /usr/src/evmone.tar.gz; \
rm -rf /usr/src/evmone.tar.gz

FROM base
COPY --from=libraries /usr/lib /usr/lib
Expand Down
4 changes: 2 additions & 2 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="3"
LABEL version="4"

ARG DEBIAN_FRONTEND=noninteractive

Expand All @@ -48,7 +48,7 @@ FROM base AS libraries
# EVMONE
RUN set -ex; \
cd /usr/src; \
git clone --branch="v0.9.1" --recurse-submodules https://github.com/ethereum/evmone.git; \
git clone --branch="v0.10.0" --recurse-submodules https://github.com/ethereum/evmone.git; \
cd evmone; \
mkdir build; \
cd build; \
Expand Down
4 changes: 2 additions & 2 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="2"
LABEL version="3"

ARG DEBIAN_FRONTEND=noninteractive

Expand Down Expand Up @@ -50,7 +50,7 @@ ENV CXX clang++
# EVMONE
RUN set -ex; \
cd /usr/src; \
git clone --branch="v0.9.1" --recurse-submodules https://github.com/ethereum/evmone.git; \
git clone --branch="v0.10.0" --recurse-submodules https://github.com/ethereum/evmone.git; \
cd evmone; \
mkdir build; \
cd build; \
Expand Down