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 <[email protected]>
bartekus · Jan 12, 2022 · a21ae05 · a21ae05
1 parent 9f400aa
commit a21ae05
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 21 deletions.
diff --git 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
@@ -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
@@ -1,4 +1,3 @@
 rich
-cffi==1.14.6
 pynacl
 aiofiles