fix: dockerfile edit

Author: andhreljaKern

.github/workflows/pi_matrix.yml

@@ -59,6 +59,6 @@ jobs:
         run: |
           bash cicd-deployment-scripts/pi/matrix.sh \
             -p "${{ github.event.pull_request.number || '' }}" \
-            -s cicd-deployment-scripts/pi/settings.sh \
+            -s cicd-deployment-scripts/pi/constants.sh \
             -t "${{ inputs.parent_image_type }}" \
             -d "${{ inputs.edit_dockerfile }}"

pi/settings.sh renamed to pi/constants.sh

@@ -5,9 +5,17 @@ export torch_cpu=(
     "refinery-ml-exec-env"
 )
 
+export torch_cpu_dockerfile=(
+    "refinery-embedder"
+    "refinery-ml-exec-env"
+)
+
 export torch_cuda=(
     "refinery-embedder"
 )
+export torch_cuda_dockerfile=(
+    "refinery-embedder"
+)
 
 export common_dockerfile=(
     "refinery-gateway"
@@ -41,6 +49,12 @@ export exec_env=(
     "cognition-exec-env"
 )
 
+export exec_env_dockerfile=(
+    "refinery-ac-exec-env"
+    "refinery-lf-exec-env"
+    "cognition-exec-env"
+)
+
 export next=(
     "admin-dashboard"
     "cognition-ui"

pi/edit_dockerfile.sh

@@ -3,7 +3,7 @@
 set -e
 
 PARENT_IMAGE_NAME="refinery-parent-images"
-RELEASE_TAG=""
+RELEASE_TAG="parent-image-updates"
 DOCKER_REGISTRY="kernai"
 DOCKERFILE="Dockerfile"
 HEAD_REF="parent-image-updates"
@@ -24,7 +24,8 @@ grep "${DOCKER_REGISTRY}/${PARENT_IMAGE_NAME}" $DOCKERFILE | while read -r line
     ALREADY_UPDATED=$(echo $PI_EXISTING_TAG | grep $RELEASE_TAG || true)
 
     if [ -z $ALREADY_UPDATED ] && [ -z $HEAD_REF ]; then
-        PARENT_IMAGE_TYPE=$(echo $PI_EXISTING_TAG | cut -d '-' -f 2-)
+        image_version=$(echo $PI_EXISTING_TAG | cut -d '-' -f 1)
+        PARENT_IMAGE_TYPE=$(echo $PI_EXISTING_TAG | sed "s|${image_version}-||g")
     elif [ -n $ALREADY_UPDATED ] && [ -z $HEAD_REF ]; then
         PARENT_IMAGE_TYPE=$(echo $PI_EXISTING_TAG | sed "s|${RELEASE_TAG}-||g")
     elif [ -n $HEAD_REF ]; then

pi/matrix.sh

@@ -2,9 +2,9 @@
 
 set -e
 
+PR_NUMBER="38"
+SOURCE_SCRIPT="pi/constants.sh"
 PARENT_IMAGE_TYPE=""
-PR_NUMBER=""
-SOURCE_SCRIPT="pi/settings.sh"
 EDIT_DOCKERFILE=false
 
 while getopts t:p:s:d: flag
@@ -22,7 +22,7 @@ source $SOURCE_SCRIPT
 UPDATED_PARENT_TYPES=()
 
 if [ -n $PR_NUMBER ] && [ -z $PARENT_IMAGE_TYPE ]; then
-    UPDATED_FILES=$(gh pr diff $PR_NUMBER --name-only)
+    UPDATED_FILES=$(gh pr diff $PR_NUMBER --name-only --repo code-kern-ai/refinery-submodule-parent-images)
     while IFS= read -r file; do
         if [[ $file != requirements/* ]] || [[ $file != *.in ]]; then
             continue
@@ -32,14 +32,16 @@ if [ -n $PR_NUMBER ] && [ -z $PARENT_IMAGE_TYPE ]; then
         UPDATED_PARENT_TYPES+=($parent_image_type)
 
     done <<< "$UPDATED_FILES"
-    echo "::notice::Exporting matrix for parent image types: $UPDATED_PARENT_TYPES"
+    # TODO: UPDATED_PARENT_TYPES are not resolved correctly
+    echo -e "::notice::Exporting matrix for parent image types: $UPDATED_PARENT_TYPES"
 elif [ -n $PARENT_IMAGE_TYPE ]; then
     echo "::notice::Exporting matrix for parent image type: $PARENT_IMAGE_TYPE"
     UPDATED_PARENT_TYPES=( $PARENT_IMAGE_TYPE )
 fi
 
 PARENT_IMAGE_TYPES=""
 UPDATE_APPS=""
+INCLUDES=""
 for parent_image_type in "${UPDATED_PARENT_TYPES[@]}"; do
     PARENT_IMAGE_TYPES+="\"$parent_image_type\","
     if [ $EDIT_DOCKERFILE = true ]; then
@@ -51,6 +53,8 @@ for parent_image_type in "${UPDATED_PARENT_TYPES[@]}"; do
         if [[ ! "$UPDATE_APPS" == *"$app"* ]]; then
             UPDATE_APPS+='"'$app'",'
         fi
+        # Includes require keeping track of constants, but is a controlled approach (instead of UPDATE_APPS)
+        INCLUDES+='{ "parent_image_type": "'${parent_image_type}'", "app": "'${app}'" },'
     done
 done