diff --git a/Dockerfile b/Dockerfile index b1f6b3c6a..eecbfffbe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 . . @@ -41,10 +41,7 @@ LABEL version="unknown" EXPOSE 30303 60000 8545 # Referenced in the binary -RUN apk add --no-cache libgcc pcre-dev libpq-dev bind-tools - -# 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 +RUN apk add --no-cache libgcc libpq-dev bind-tools # Copy to separate location to accomodate different MAKE_TARGET values COPY --from=nim-build /app/build/$MAKE_TARGET /usr/local/bin/ diff --git a/apps/liteprotocoltester/Dockerfile.liteprotocoltester.compile b/apps/liteprotocoltester/Dockerfile.liteprotocoltester.compile index 6d789ebd1..497570c75 100644 --- a/apps/liteprotocoltester/Dockerfile.liteprotocoltester.compile +++ b/apps/liteprotocoltester/Dockerfile.liteprotocoltester.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,7 +40,7 @@ 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 diff --git a/docker/binaries/Dockerfile.bn.amd64 b/docker/binaries/Dockerfile.bn.amd64 index c8dc0ffeb..d5495516b 100644 --- a/docker/binaries/Dockerfile.bn.amd64 +++ b/docker/binaries/Dockerfile.bn.amd64 @@ -13,12 +13,9 @@ EXPOSE 30303 60000 8545 # Referenced in the binary RUN apt-get update &&\ - apt-get install -y libpcre3 libpq-dev curl iproute2 wget dnsutils &&\ + apt-get install -y libpq-dev curl iproute2 wget 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/ diff --git a/nix/shell.nix b/nix/shell.nix index 26086a26e..0db73dc25 100644 --- a/nix/shell.nix +++ b/nix/shell.nix @@ -1,4 +1,4 @@ -{ +{ pkgs ? import { }, }: let @@ -20,7 +20,4 @@ pkgs.mkShell { nim-unwrapped-2_0 ]; - LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath [ - pkgs.pcre - ]; }