Merge branch 'main' into vector-add

defenseunicorns · Sep 17, 2024 · 970d358 · 970d358
2 parents d5fbad3 + e624d73
commit 970d358
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/tasks/create.yaml b/tasks/create.yaml
@@ -60,7 +60,14 @@ tasks:
     actions:
       - description: "Build the UDS Core Pepr Module"
         cmd: |
-          CUSTOM_PEPR_IMAGE=$( [ "${FLAVOR}" = "registry1" ] && echo "--custom-image ${REGISTRY1_PEPR_IMAGE}" ) || CUSTOM_PEPR_IMAGE=""
+          if [ -n "${PEPR_CUSTOM_IMAGE}" ] ; then
+            # e.g. PEPR_CUSTOM_IMAGE="pepr:dev uds run slim-dev"
+            PEPR_OVERRIDE_IMAGE="--custom-image ${PEPR_CUSTOM_IMAGE}"
+          elif [ "${FLAVOR}" = "registry1" ] ; then
+            PEPR_OVERRIDE_IMAGE="--custom-image ${REGISTRY1_PEPR_IMAGE}"
+          else
+            PEPR_OVERRIDE_IMAGE=""
+          fi
           rm -fr dist
           npm ci
-          npx pepr build -z chart $CUSTOM_PEPR_IMAGE
+          npx pepr build -z chart $PEPR_OVERRIDE_IMAGE