From 762f945e628cefc4f4eaf92449b08da7eb8d2190 Mon Sep 17 00:00:00 2001
From: jasquat <jasquat@users.noreply.github.com>
Date: Mon, 20 Nov 2023 16:49:30 -0500
Subject: [PATCH] updated connector-proxy-demo dockerfile to be more like
 backend w/ burnettk

---
 connector-proxy-demo/Dockerfile  | 76 ++++++++++++++++++++++++--------
 spiffworkflow-backend/Dockerfile |  2 +-
 2 files changed, 59 insertions(+), 19 deletions(-)

diff --git a/connector-proxy-demo/Dockerfile b/connector-proxy-demo/Dockerfile
index 6161dc8cd..a3c84d089 100644
--- a/connector-proxy-demo/Dockerfile
+++ b/connector-proxy-demo/Dockerfile
@@ -1,26 +1,66 @@
-FROM ghcr.io/sartography/python:3.11
+# Base image to share ENV vars that activate VENV.
+FROM python:3.11.6-slim-bookworm AS base
 
-RUN useradd _gunicorn --no-create-home --user-group
-
-RUN apt-get update && \
-    apt-get install -y -q \
-        gcc libssl-dev \
-        curl gunicorn3
+ENV VIRTUAL_ENV=/app/venv
+RUN python3 -m venv $VIRTUAL_ENV
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
 
 WORKDIR /app
+
+
+######################## - DEPLOYMENT
+
+# base plus packages needed for deployment. Could just install these in final, but then we can't cache as much.
+# vim is just for debugging
+FROM base AS deployment
+
+# git-core because the app does "git commit", etc
+# curl because the docker health check uses it
+# procps because it is useful for debugging
+# gunicorn3 for web server
+# default-mysql-client for convenience accessing mysql docker container
+# vim ftw
+RUN apt-get update \
+ && apt-get clean -y \
+ && apt-get install -y -q git-core curl procps gunicorn3 default-mysql-client vim-tiny \
+ && rm -rf /var/lib/apt/lists/*
+
+RUN pip install poetry==1.6.1
+
+
+######################## - SETUP
+
+# Setup image for installing Python dependencies.
+FROM base AS setup
+
+# poetry 1.4 seems to cause an issue where it errors with
+#   This error originates from the build backend, and is likely not a
+#   problem with poetry but with lazy-object-proxy (1.7.1) not supporting PEP 517 builds.
+#   You can verify this by running 'pip wheel --use-pep517 "lazy-object-proxy (==1.7.1) ; python_version >= "3.6""'.
+# Pinnning to 1.3.2 to attempt to avoid it.
+RUN pip install poetry==1.6.1
+RUN useradd _gunicorn --no-create-home --user-group
+
+RUN apt-get update \
+ && apt-get install -y -q gcc libssl-dev pkg-config
+
+# poetry install takes a long time and can be cached if dependencies don't change,
+# so that's why we tolerate running it twice.
 COPY pyproject.toml poetry.lock /app/
 RUN poetry install
 
-RUN set -xe \
-  && apt-get remove -y gcc python3-dev libssl-dev \
-  && apt-get autoremove -y \
-  && apt-get clean -y \
-  && rm -rf /var/lib/apt/lists/*
-
-COPY . /app/
-
-# run poetry install again AFTER copying the app into the image
-# otherwise it does not know what the main app module is
+COPY . /app
 RUN poetry install
 
-CMD ./bin/boot_server_in_docker
+
+######################## - FINAL
+
+# Final image without setup dependencies.
+FROM deployment AS final
+
+LABEL source="https://github.com/sartography/spiff-arena/connector-proxy-demo"
+LABEL description="Demo connector proxy component for SpiffWorkflow"
+
+COPY --from=setup /app /app
+
+CMD ["./bin/boot_server_in_docker"]
diff --git a/spiffworkflow-backend/Dockerfile b/spiffworkflow-backend/Dockerfile
index 78a573b3a..b5274aec3 100644
--- a/spiffworkflow-backend/Dockerfile
+++ b/spiffworkflow-backend/Dockerfile
@@ -59,7 +59,7 @@ RUN poetry install --without dev
 # Final image without setup dependencies.
 FROM deployment AS final
 
-LABEL source="https://github.com/sartography/spiff-arena"
+LABEL source="https://github.com/sartography/spiff-arena/spiffworkflow-backend"
 LABEL description="Backend component of SpiffWorkflow, a software development platform for building, running, and monitoring executable diagrams"
 
 COPY --from=setup /app /app