From a21ae059cdd9e6bbec4fd4a5f05552ebf545c38d Mon Sep 17 00:00:00 2001 From: Wade Barnes Date: Wed, 12 Jan 2022 07:40:15 -0800 Subject: [PATCH] Updated fix for cffi build error. - The updated version of `pip` is able to find the wheel(s) for the updated version of `PyNaCl`. Therefore cffi does not need to be built. - This provides a significant improvement in the build time for the images. Signed-off-by: Wade Barnes --- docker/Dockerfile.tails-server | 11 +---------- docker/Dockerfile.test | 11 +---------- requirements.dev.txt | 1 - 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/docker/Dockerfile.tails-server b/docker/Dockerfile.tails-server index 13e2764..82b923d 100644 --- a/docker/Dockerfile.tails-server +++ b/docker/Dockerfile.tails-server @@ -1,18 +1,9 @@ FROM bcgovimages/von-image:next-1 -ARG user=indy -USER root -RUN apt-get update -y && \ - apt-get install -y --no-install-recommends \ - build-essential \ - libffi-dev \ - python3-dev && \ - rm -rf /var/lib/apt/lists/* -USER $user - ADD requirements.txt . ADD requirements.dev.txt . +RUN pip3 install --upgrade pip RUN pip3 install --no-cache-dir -r requirements.txt -r requirements.dev.txt ADD tails_server ./tails_server diff --git a/docker/Dockerfile.test b/docker/Dockerfile.test index f627d3b..d6dc7af 100644 --- a/docker/Dockerfile.test +++ b/docker/Dockerfile.test @@ -1,18 +1,9 @@ FROM bcgovimages/von-image:next-1 -ARG user=indy -USER root -RUN apt-get update -y && \ - apt-get install -y --no-install-recommends \ - build-essential \ - libffi-dev \ - python3-dev && \ - rm -rf /var/lib/apt/lists/* -USER $user - ADD requirements.txt . ADD requirements.dev.txt . +RUN pip3 install --upgrade pip RUN pip3 install --no-cache-dir -r requirements.txt -r requirements.dev.txt ADD test ./ diff --git a/requirements.dev.txt b/requirements.dev.txt index cfdbc47..c3cff61 100644 --- a/requirements.dev.txt +++ b/requirements.dev.txt @@ -1,4 +1,3 @@ rich -cffi==1.14.6 pynacl aiofiles \ No newline at end of file