From 07df94b19569c83ed90f6a8006b07c25c0a517f8 Mon Sep 17 00:00:00 2001
From: "James R. Barlow" <james@purplerock.ca>
Date: Tue, 25 Jul 2023 00:50:13 -0700
Subject: [PATCH] Improve Dockerfile - builder still needed

---
 .docker/Dockerfile | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 3810a2b6..3b70a3cc 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -13,29 +13,26 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   zlib1g \
   liblept5
 
-# FROM base as builder
+FROM base as builder
 
-# # Note we need leptonica here to build jbig2
-# RUN apt-get update && apt-get install -y --no-install-recommends \
-#   build-essential autoconf automake libtool \
-#   python3-dev \
-#   python3-distutils \
-#   libffi-dev \
-#   ca-certificates \
-#   curl \
-#   git \
-#   libcairo2-dev \
-#   pkg-config
+# Note we need leptonica here to build jbig2
+RUN apt-get update && apt-get install -y --no-install-recommends \
+  python3-dev \
+  python3-distutils \
+  ca-certificates \
+  curl \
+  git \
+  libcairo2-dev \
+  pkg-config
 
-# # Get the latest pip
-# RUN \
-#   curl https://bootstrap.pypa.io/get-pip.py | python3
+# Get the latest pip
+RUN curl https://bootstrap.pypa.io/get-pip.py | python3
 
-# COPY . /app
+COPY . /app
 
-# WORKDIR /app
+WORKDIR /app
 
-# RUN pip3 install --no-cache-dir .[test,webservice,watcher]
+RUN pip3 install --no-cache-dir .[test,webservice,watcher]
 
 FROM base