From 62be30da194f75e68cb5f33edaf12221e7274d65 Mon Sep 17 00:00:00 2001 From: Prem Chaitanya Prathi Date: Thu, 9 Oct 2025 18:08:34 +0530 Subject: [PATCH] fix: remove pcre dependency as it is not used anymore and causing random CI docker build failures (#3566) --- Dockerfile.lightpushWithMix.compile | 6 +-- .../Dockerfile.liteprotocoltester | 54 +++++++++---------- .../Dockerfile.liteprotocoltester.compile | 3 -- docker/binaries/Dockerfile.bn.local | 5 +- 4 files changed, 28 insertions(+), 40 deletions(-) diff --git a/Dockerfile.lightpushWithMix.compile b/Dockerfile.lightpushWithMix.compile index e39b88d91..381ee60ef 100644 --- a/Dockerfile.lightpushWithMix.compile +++ b/Dockerfile.lightpushWithMix.compile @@ -7,7 +7,7 @@ ARG NIM_COMMIT ARG LOG_LEVEL=TRACE # Get build tools and required header files -RUN apk add --no-cache bash git build-base openssl-dev pcre-dev linux-headers curl jq +RUN apk add --no-cache bash git build-base openssl-dev linux-headers curl jq WORKDIR /app COPY . . @@ -40,14 +40,12 @@ LABEL version="unknown" EXPOSE 30303 60000 8545 # Referenced in the binary -RUN apk add --no-cache libgcc pcre-dev libpq-dev \ +RUN apk add --no-cache libgcc libpq-dev \ wget \ iproute2 \ python3 \ jq -# Fix for 'Error loading shared library libpcre.so.3: No such file or directory' -RUN ln -s /usr/lib/libpcre.so /usr/lib/libpcre.so.3 COPY --from=nim-build /app/build/lightpush_publisher_mix /usr/bin/ RUN chmod +x /usr/bin/lightpush_publisher_mix diff --git a/apps/liteprotocoltester/Dockerfile.liteprotocoltester b/apps/liteprotocoltester/Dockerfile.liteprotocoltester index 1948300d0..4c4b122b6 100644 --- a/apps/liteprotocoltester/Dockerfile.liteprotocoltester +++ b/apps/liteprotocoltester/Dockerfile.liteprotocoltester @@ -1,37 +1,33 @@ - # TESTING IMAGE -------------------------------------------------------------- +# TESTING IMAGE -------------------------------------------------------------- - ## NOTICE: This is a short cut build file for ubuntu users who compiles nwaku in ubuntu distro. - ## This is used for faster turnaround time for testing the compiled binary. - ## Prerequisites: compiled liteprotocoltester binary in build/ directory +## NOTICE: This is a short cut build file for ubuntu users who compiles nwaku in ubuntu distro. +## This is used for faster turnaround time for testing the compiled binary. +## Prerequisites: compiled liteprotocoltester binary in build/ directory - FROM ubuntu:noble AS prod +FROM ubuntu:noble AS prod - LABEL maintainer="zoltan@status.im" - LABEL source="https://github.com/waku-org/nwaku" - LABEL description="Lite Protocol Tester: Waku light-client" - LABEL commit="unknown" - LABEL version="unknown" +LABEL maintainer="zoltan@status.im" +LABEL source="https://github.com/waku-org/nwaku" +LABEL description="Lite Protocol Tester: Waku light-client" +LABEL commit="unknown" +LABEL version="unknown" - # DevP2P, LibP2P, and JSON RPC ports - EXPOSE 30303 60000 8545 +# DevP2P, LibP2P, and JSON RPC ports +EXPOSE 30303 60000 8545 - # Referenced in the binary - RUN apt-get update && apt-get install -y --no-install-recommends \ - libgcc1 \ - libpcre3 \ - libpq-dev \ - wget \ - iproute2 \ - && rm -rf /var/lib/apt/lists/* +# Referenced in the binary +RUN apt-get update && apt-get install -y --no-install-recommends \ + libgcc1 \ + libpq-dev \ + wget \ + iproute2 \ + && rm -rf /var/lib/apt/lists/* - # Fix for 'Error loading shared library libpcre.so.3: No such file or directory' - RUN ln -s /usr/lib/libpcre.so /usr/lib/libpcre.so.3 +COPY build/liteprotocoltester /usr/bin/ +COPY apps/liteprotocoltester/run_tester_node.sh /usr/bin/ +COPY apps/liteprotocoltester/run_tester_node_on_fleet.sh /usr/bin/ - COPY build/liteprotocoltester /usr/bin/ - COPY apps/liteprotocoltester/run_tester_node.sh /usr/bin/ - COPY apps/liteprotocoltester/run_tester_node_on_fleet.sh /usr/bin/ +ENTRYPOINT ["/usr/bin/run_tester_node.sh", "/usr/bin/liteprotocoltester"] - ENTRYPOINT ["/usr/bin/run_tester_node.sh", "/usr/bin/liteprotocoltester"] - - # # By default just show help if called without arguments - CMD ["--help"] +# # By default just show help if called without arguments +CMD ["--help"] diff --git a/apps/liteprotocoltester/Dockerfile.liteprotocoltester.compile b/apps/liteprotocoltester/Dockerfile.liteprotocoltester.compile index 497570c75..9e2432051 100644 --- a/apps/liteprotocoltester/Dockerfile.liteprotocoltester.compile +++ b/apps/liteprotocoltester/Dockerfile.liteprotocoltester.compile @@ -45,9 +45,6 @@ RUN apk add --no-cache libgcc libpq-dev \ iproute2 \ python3 -# Fix for 'Error loading shared library libpcre.so.3: No such file or directory' -RUN ln -s /usr/lib/libpcre.so /usr/lib/libpcre.so.3 - COPY --from=nim-build /app/build/liteprotocoltester /usr/bin/ RUN chmod +x /usr/bin/liteprotocoltester diff --git a/docker/binaries/Dockerfile.bn.local b/docker/binaries/Dockerfile.bn.local index 79445d14f..7a2305bd1 100644 --- a/docker/binaries/Dockerfile.bn.local +++ b/docker/binaries/Dockerfile.bn.local @@ -14,12 +14,9 @@ EXPOSE 30303 60000 8545 # Referenced in the binary RUN apt-get update &&\ - apt-get install -y libpcre3 libpq-dev curl iproute2 wget jq dnsutils &&\ + apt-get install -y libpq-dev curl iproute2 wget jq dnsutils &&\ apt-get clean && rm -rf /var/lib/apt/lists/* -# Fix for 'Error loading shared library libpcre.so.3: No such file or directory' -RUN ln -s /usr/lib/libpcre.so /usr/lib/libpcre.so.3 - # Copy to separate location to accomodate different MAKE_TARGET values ADD ./build/$MAKE_TARGET /usr/local/bin/