diff --git a/projects/monero/Dockerfile b/projects/monero/Dockerfile index 5e563c125..37a719b25 100644 --- a/projects/monero/Dockerfile +++ b/projects/monero/Dockerfile @@ -17,8 +17,7 @@ # Multistage docker build, requires docker 17.05 # builder stage -FROM gcr.io/oss-fuzz-base/base-builder@sha256:19782f7fe8092843368894dbc471ce9b30dd6a2813946071a36e8b05f5b1e27e -# ! This project was pinned after a clang bump. Please remove the pin, Try to fix any build warnings and errors, as well as runtime errors +FROM gcr.io/oss-fuzz-base/base-builder RUN set -ex && \ apt-get update && \ @@ -56,18 +55,20 @@ WORKDIR monero ENV CFLAGS="${CFLAGS} -fPIC -pthread" ENV CXXFLAGS="${CXXFLAGS} -fPIC -pthread" +## Workaround for boost build issue +RUN cp /usr/local/include/x86_64-unknown-linux-gnu/c++/v1/__config_site /usr/local/include/c++/v1/ + ## Boost -ARG BOOST_VERSION=1_70_0 -ARG BOOST_VERSION_DOT=1.70.0 -ARG BOOST_HASH=430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778 +ARG BOOST_VERSION=1_84_0 +ARG BOOST_VERSION_DOT=1.84.0 +ARG BOOST_HASH=a5800f405508f5df8114558ca9855d2640a2de8f0445f051fa1c7c3383045724 RUN set -ex \ - && curl -s -L -o boost_${BOOST_VERSION}.tar.bz2 https://downloads.getmonero.org/libs/boost_${BOOST_VERSION}.tar.bz2 \ - && echo "${BOOST_HASH} boost_${BOOST_VERSION}.tar.bz2" | sha256sum -c \ - && tar -xjf boost_${BOOST_VERSION}.tar.bz2 \ + && curl -s -L -o boost_${BOOST_VERSION}.tar.gz https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION_DOT}/source/boost_${BOOST_VERSION}.tar.gz \ + && echo "${BOOST_HASH} boost_${BOOST_VERSION}.tar.gz" | sha256sum -c \ + && tar -xf boost_${BOOST_VERSION}.tar.gz \ && cd boost_${BOOST_VERSION} \ - && sed -i -e 's/use(* m_instance)/if (m_instance) use(* m_instance)/' boost/serialization/singleton.hpp \ && ./bootstrap.sh --with-toolset=clang \ - && ./b2 --build-type=minimal link=static runtime-link=static --with-chrono --with-date_time --with-filesystem --with-program_options --with-regex --with-serialization --with-system --with-thread --with-locale threading=multi threadapi=pthread cflags="$CFLAGS" cxxflags="$CXXFLAGS" stage + && ./b2 --build-type=minimal link=static runtime-link=static --with-chrono --with-date_time --with-filesystem --with-program_options --with-regex --with-serialization --with-system --with-thread --with-locale threading=multi threadapi=pthread cflags="$CFLAGS" cxxflags="$CXXFLAGS" install ENV BOOST_ROOT /usr/local/boost_${BOOST_VERSION} # OpenSSL