perf: update release workflow

Author: andhreljaKern

.github/workflows/pi_matrix.yml

@@ -18,6 +18,11 @@ on:
         required: false
         type: string
         default: ''
+      edit_dockerfile:
+        description: 'If set to true, "include" only outputs apps associated to this parent image type with no internal dependencies (e.g. common -> mini)'
+        required: false
+        type: boolean
+        default: false
     outputs:
       parent_image_type:
         description: 'List[str] of parent image types'
@@ -55,4 +60,5 @@ jobs:
           bash cicd-deployment-scripts/pi/matrix.sh \
             -p "${{ github.event.pull_request.number || '' }}" \
             -s cicd-deployment-scripts/pi/settings.sh \
-            -t "${{ inputs.parent_image_type }}"
+            -t "${{ inputs.parent_image_type }}" \
+            -d "${{ inputs.edit_dockerfile }}"

.github/workflows/pi_release.yml

@@ -19,6 +19,7 @@ jobs:
     with:
       repository: ${{ github.repository }}
       parent_image_type: ${{ vars.PARENT_IMAGE_TYPE }}
+      edit_dockerfile: true
 
   pi-edit:
     name: 'Parent Images: Dockerfile' # suffix populated by matrix
@@ -48,6 +49,9 @@ jobs:
 
       - name: Perform Edit/Git Operations
         run: |
+          git branch -D "$HEAD_REF" || true
+          git checkout -b "$HEAD_REF"
+          
           bash cicd-deployment-scripts/pi/edit_dockerfile.sh \
             -i ${{ env.PARENT_IMAGE_NAME }} \
             -t ${{ matrix.parent_image_type }} \
@@ -63,9 +67,6 @@ jobs:
           git config user.email "[email protected]"
           git config user.name "GitHub Actions"
 
-          git branch -D "$HEAD_REF" || true
-          git checkout -b "$HEAD_REF"
-
           git add ${{ env.DOCKERFILE }}
           git commit -m "$PR_TITLE" || true
           git push --force origin "$HEAD_REF"

pi/matrix.sh

@@ -5,13 +5,15 @@ set -e
 PARENT_IMAGE_TYPE=""
 PR_NUMBER=""
 SOURCE_SCRIPT="pi/settings.sh"
+EDIT_DOCKERFILE=false
 
-while getopts t:p:s: flag
+while getopts t:p:s:d: flag
 do
     case "${flag}" in
         t) PARENT_IMAGE_TYPE=${OPTARG};;
         p) PR_NUMBER=${OPTARG};;
         s) SOURCE_SCRIPT=${OPTARG};;
+        d) EDIT_DOCKERFILE=${OPTARG};;
     esac
 done
 
@@ -40,7 +42,11 @@ PARENT_IMAGE_TYPES=""
 INCLUDES=""
 for parent_image_type in "${UPDATED_PARENT_TYPES[@]}"; do
     PARENT_IMAGE_TYPES+="\"$parent_image_type\","
-    eval 'APP_REPOS=( "${'$(echo ${parent_image_type} | sed "s|-|_|g")'[@]}" )'
+    if [ $EDIT_DOCKERFILE = true ]; then
+        eval 'APP_REPOS=( "${'$(echo ${parent_image_type}_dockerfile | sed "s|-|_|g")'[@]}" )'
+    else
+        eval 'APP_REPOS=( "${'$(echo ${parent_image_type} | sed "s|-|_|g")'[@]}" )'
+    fi
     for app in "${APP_REPOS[@]}"; do
         INCLUDES+='{ "parent_image_type": "'${parent_image_type}'", "app": "'${app}'" },'
     done

pi/settings.sh

@@ -9,21 +9,29 @@ export torch_cuda=(
     "refinery-embedder"
 )
 
-export common=(
+export common_dockerfile=(
     "refinery-gateway"
     "refinery-neural-search"
     "refinery-tokenizer"
     "refinery-updater"
     "refinery-weak-supervisor"
     "refinery-model-provider"
     "cognition-gateway"
+)
+
+export common=(
+    "${common_dockerfile[@]}"
     "${torch_cpu[@]}"
     "${torch_cuda[@]}"
 )
 
-export mini=(
+export mini_dockerfile=(
     "refinery-authorizer"
     "refinery-gateway-proxy"
+)
+
+export mini=(
+    "${mini_dockerfile[@]}"
     "${common[@]}"
 )