From 892a14c91430247431c976ecb6e8adcf2494a556 Mon Sep 17 00:00:00 2001
From: Alex Steel <130377221+asteel-gsa@users.noreply.github.com>
Date: Wed, 6 Mar 2024 10:33:33 -0500
Subject: [PATCH] move jq into `base as deployment`

---
 .github/workflows/docker_image_for_main_builds.yml | 2 +-
 spiffworkflow-backend/Dockerfile                   | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/docker_image_for_main_builds.yml b/.github/workflows/docker_image_for_main_builds.yml
index f662d9542..cb125f33e 100644
--- a/.github/workflows/docker_image_for_main_builds.yml
+++ b/.github/workflows/docker_image_for_main_builds.yml
@@ -32,7 +32,7 @@ on:
       - main
       # - spiffdemo
       # - feature/update-extension-docs
-      # - deploy-to-cloud-gov
+      - deploy-to-cloud-gov
 
 jobs:
   create_frontend_docker_image:
diff --git a/spiffworkflow-backend/Dockerfile b/spiffworkflow-backend/Dockerfile
index f96431ca9..d5f10a5ba 100644
--- a/spiffworkflow-backend/Dockerfile
+++ b/spiffworkflow-backend/Dockerfile
@@ -25,11 +25,13 @@ RUN apt-get update \
  && apt-get install -y -q git-core curl procps gunicorn3 default-mysql-client vim-tiny \
  && rm -rf /var/lib/apt/lists/*
 
+# install jq so we can get values from vcap
+RUN pip install jq
+
 # keep pip up to date
 RUN pip install --upgrade pip
 RUN pip install poetry==1.8.1
 
-
 ######################## - SETUP
 
 # Setup image for installing Python dependencies.
@@ -43,9 +45,6 @@ FROM base AS setup
 RUN pip install poetry==1.6.1
 RUN useradd _gunicorn --no-create-home --user-group
 
-# install jq so we can get values from vcap
-RUN pip install jq
-
 # default-libmysqlclient-dev for mysqlclient lib
 RUN apt-get update \
  && apt-get install -y -q gcc libssl-dev libpq-dev default-libmysqlclient-dev pkg-config libffi-dev