logos-messaging/logos-messaging-nim
1
0
Fork 0
mirror of https://github.com/logos-messaging/logos-messaging-nim.git synced 2026-01-02 05:53:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove pcre dependency as it is not used anymore and causing random CI docker build failures (#3566)

Browse Source
This commit is contained in:
Prem Chaitanya Prathi 2025-10-09 18:08:34 +05:30 committed by GitHub
parent a87b787c4e
commit 62be30da19
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 28 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile.lightpushWithMix.compile
View File

@ -7,7 +7,7 @@ ARG NIM_COMMIT
ARG LOG_LEVEL=TRACE ARG LOG_LEVEL=TRACE
# Get build tools and required header files # 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 WORKDIR /app
COPY . . COPY . .
@ -40,14 +40,12 @@ LABEL version="unknown"
EXPOSE 30303 60000 8545 EXPOSE 30303 60000 8545
# Referenced in the binary # Referenced in the binary
RUN apk add --no-cache libgcc pcre-dev libpq-dev \ RUN apk add --no-cache libgcc libpq-dev \
wget \ wget \
iproute2 \ iproute2 \
python3 \ python3 \
jq 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/ COPY --from=nim-build /app/build/lightpush_publisher_mix /usr/bin/
RUN chmod +x /usr/bin/lightpush_publisher_mix RUN chmod +x /usr/bin/lightpush_publisher_mix

54
apps/liteprotocoltester/Dockerfile.liteprotocoltester
View File

@ -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. ## 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. ## This is used for faster turnaround time for testing the compiled binary.
## Prerequisites: compiled liteprotocoltester binary in build/ directory ## Prerequisites: compiled liteprotocoltester binary in build/ directory
FROM ubuntu:noble AS prod FROM ubuntu:noble AS prod
LABEL maintainer="zoltan@status.im" LABEL maintainer="zoltan@status.im"
LABEL source="https://github.com/waku-org/nwaku" LABEL source="https://github.com/waku-org/nwaku"
LABEL description="Lite Protocol Tester: Waku light-client" LABEL description="Lite Protocol Tester: Waku light-client"
LABEL commit="unknown" LABEL commit="unknown"
LABEL version="unknown" LABEL version="unknown"
# DevP2P, LibP2P, and JSON RPC ports # DevP2P, LibP2P, and JSON RPC ports
EXPOSE 30303 60000 8545 EXPOSE 30303 60000 8545
# Referenced in the binary # Referenced in the binary
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
libgcc1 \ libgcc1 \
libpcre3 \ libpq-dev \
libpq-dev \ wget \
wget \ iproute2 \
iproute2 \ && rm -rf /var/lib/apt/lists/*
&& rm -rf /var/lib/apt/lists/*
# Fix for 'Error loading shared library libpcre.so.3: No such file or directory' COPY build/liteprotocoltester /usr/bin/
RUN ln -s /usr/lib/libpcre.so /usr/lib/libpcre.so.3 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/ ENTRYPOINT ["/usr/bin/run_tester_node.sh", "/usr/bin/liteprotocoltester"]
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"] # # By default just show help if called without arguments
CMD ["--help"]
# # By default just show help if called without arguments
CMD ["--help"]

3
apps/liteprotocoltester/Dockerfile.liteprotocoltester.compile
View File

@ -45,9 +45,6 @@ RUN apk add --no-cache libgcc libpq-dev \
iproute2 \ iproute2 \
python3 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/ COPY --from=nim-build /app/build/liteprotocoltester /usr/bin/
RUN chmod +x /usr/bin/liteprotocoltester RUN chmod +x /usr/bin/liteprotocoltester

5
docker/binaries/Dockerfile.bn.local
View File

@ -14,12 +14,9 @@ EXPOSE 30303 60000 8545
# Referenced in the binary # Referenced in the binary
RUN apt-get update &&\ 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/* 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 # Copy to separate location to accomodate different MAKE_TARGET values
ADD ./build/$MAKE_TARGET /usr/local/bin/ ADD ./build/$MAKE_TARGET /usr/local/bin/