Skip to content

Commit 4db4f83

Browse files
fix remove libpcre lib dependency used for docker builds (#3552)
* fix libpcre installation in Dockerfile for debian:stable-slim Seems with debian:stable-slim now points to Debian Bookworm and that made libpcre3 deprecated we have a failing docker build. * remove libpcre3 dependency completely as we dont use Nims std/re regex lib. * Remove all remaining reference to pcre library in our image builds
1 parent 84cfdba commit 4db4f83

File tree

4 files changed

+6
-15
lines changed

4 files changed

+6
-15
lines changed

Dockerfile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ARG NIM_COMMIT
77
ARG LOG_LEVEL=TRACE
88

99
# Get build tools and required header files
10-
RUN apk add --no-cache bash git build-base openssl-dev pcre-dev linux-headers curl jq
10+
RUN apk add --no-cache bash git build-base openssl-dev linux-headers curl jq
1111

1212
WORKDIR /app
1313
COPY . .
@@ -41,10 +41,7 @@ LABEL version="unknown"
4141
EXPOSE 30303 60000 8545
4242

4343
# Referenced in the binary
44-
RUN apk add --no-cache libgcc pcre-dev libpq-dev bind-tools
45-
46-
# Fix for 'Error loading shared library libpcre.so.3: No such file or directory'
47-
RUN ln -s /usr/lib/libpcre.so /usr/lib/libpcre.so.3
44+
RUN apk add --no-cache libgcc libpq-dev bind-tools
4845

4946
# Copy to separate location to accomodate different MAKE_TARGET values
5047
COPY --from=nim-build /app/build/$MAKE_TARGET /usr/local/bin/

apps/liteprotocoltester/Dockerfile.liteprotocoltester.compile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ARG NIM_COMMIT
77
ARG LOG_LEVEL=TRACE
88

99
# Get build tools and required header files
10-
RUN apk add --no-cache bash git build-base openssl-dev pcre-dev linux-headers curl jq
10+
RUN apk add --no-cache bash git build-base openssl-dev linux-headers curl jq
1111

1212
WORKDIR /app
1313
COPY . .
@@ -40,7 +40,7 @@ LABEL version="unknown"
4040
EXPOSE 30303 60000 8545
4141

4242
# Referenced in the binary
43-
RUN apk add --no-cache libgcc pcre-dev libpq-dev \
43+
RUN apk add --no-cache libgcc libpq-dev \
4444
wget \
4545
iproute2 \
4646
python3

docker/binaries/Dockerfile.bn.amd64

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,9 @@ EXPOSE 30303 60000 8545
1313

1414
# Referenced in the binary
1515
RUN apt-get update &&\
16-
apt-get install -y libpcre3 libpq-dev curl iproute2 wget dnsutils &&\
16+
apt-get install -y libpq-dev curl iproute2 wget dnsutils &&\
1717
apt-get clean && rm -rf /var/lib/apt/lists/*
1818

19-
# Fix for 'Error loading shared library libpcre.so.3: No such file or directory'
20-
RUN ln -s /usr/lib/libpcre.so /usr/lib/libpcre.so.3
21-
2219
# Copy to separate location to accomodate different MAKE_TARGET values
2320
ADD ./build/$MAKE_TARGET /usr/local/bin/
2421

nix/shell.nix

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{
1+
{
22
pkgs ? import <nixpkgs> { },
33
}:
44
let
@@ -20,7 +20,4 @@ pkgs.mkShell {
2020
nim-unwrapped-2_0
2121
];
2222

23-
LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath [
24-
pkgs.pcre
25-
];
2623
}

0 commit comments

Comments
 (0)