diff --git a/Dockerfile b/Dockerfile index f73df13..b601737 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,5 @@ # Initial base from https://github.com/sethforprivacy/monero-lws/blob/588c7f1965d3afbda8a65dc870645650e063e897/Dockerfile -# Set monerod version to install from github -ARG MONERO_COMMIT_HASH=d32b5bfe18e2f5b979fa8dc3a8966c76159ca722 - # Select ubuntu:22.04 for the build image base FROM ubuntu:22.04 as build @@ -36,7 +33,6 @@ RUN apt-get install --no-install-recommends -y \ # Set necessary args and environment variables for building Monero ARG MONERO_BRANCH -ARG MONERO_COMMIT_HASH ARG NPROC ARG TARGETARCH ENV CFLAGS='-fPIC' @@ -45,22 +41,22 @@ ENV USE_SINGLE_BUILDDIR 1 ENV BOOST_DEBUG 1 # Build expat, a dependency for libunbound -RUN set -ex && wget https://github.com/libexpat/libexpat/releases/download/R_2_8_0/expat-2.8.0.tar.bz2 && \ - echo "586494499ac3ad46d87f3beda7b1f770c1c8026a9b60e151593f8b29089a52ca expat-2.8.0.tar.bz2" | sha256sum -c && \ - tar -xf expat-2.8.0.tar.bz2 && \ - rm expat-2.8.0.tar.bz2 && \ - cd expat-2.8.0 && \ +RUN set -ex && wget https://github.com/libexpat/libexpat/releases/download/R_2_8_1/expat-2.8.1.tar.bz2 && \ + echo "f5833dd2e1cd7739ec9182804a1a29c4f0cc7c2f26b633d3a2188b7766a88ecb expat-2.8.1.tar.bz2" | sha256sum -c && \ + tar -xf expat-2.8.1.tar.bz2 && \ + rm expat-2.8.1.tar.bz2 && \ + cd expat-2.8.1 && \ ./configure --enable-static --disable-shared --prefix=/usr && \ make -j${NPROC:-$(nproc)} && \ make -j${NPROC:-$(nproc)} install # Build libunbound for static builds WORKDIR /tmp -RUN set -ex && wget https://www.nlnetlabs.nl/downloads/unbound/unbound-1.25.0.tar.gz && \ - echo "062a6eda723fe2f041bee4079b76981569f1d12e066bbd74800242fc1ebddec7 unbound-1.25.0.tar.gz" | sha256sum -c && \ - tar -xzf unbound-1.25.0.tar.gz && \ - rm unbound-1.25.0.tar.gz && \ - cd unbound-1.25.0 && \ +RUN set -ex && wget https://www.nlnetlabs.nl/downloads/unbound/unbound-1.25.1.tar.gz && \ + echo "0fe8b6277b0959cfd17562debac0aa5f71e0b02dc4ffa9c60271c583edab586f unbound-1.25.1.tar.gz" | sha256sum -c && \ + tar -xzf unbound-1.25.1.tar.gz && \ + rm unbound-1.25.1.tar.gz && \ + cd unbound-1.25.1 && \ ./configure --disable-shared --enable-static --without-pyunbound --with-libexpat=/usr --with-ssl=/usr --with-libevent=no --without-pythonmodule --disable-flto --with-pthreads --with-libunbound-only --with-pic && \ make -j${NPROC:-$(nproc)} && \ make -j${NPROC:-$(nproc)} install diff --git a/external/monero b/external/monero index b9998fc..be4493d 160000 --- a/external/monero +++ b/external/monero @@ -1 +1 @@ -Subproject commit b9998fc9e1c280d30e4b40ba983b1964eb256d66 +Subproject commit be4493d1b05bf4247cf8f243c9f5042fa967cb9d