From e20e59be8b5e40d5d5ea707df8bcd6e972f1bdd3 Mon Sep 17 00:00:00 2001
From: Sean Pryor <spryor@redhat.com>
Date: Wed, 12 Jul 2023 15:16:43 -0400
Subject: [PATCH 1/3] Update to ensure caikit user is 1001 in image

---
 Dockerfile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d2ac31d5..24d332c1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,16 +3,15 @@ FROM quay.io/opendatahub/text-generation-inference:fast-836fa5f
 WORKDIR /caikit
 COPY caikit /caikit
 
-# caikit-nlp has caikit and caikit-tgis-backend as dependencies
-# In future this will be replaced with just standard pip installs
 RUN yum -y install git && \
     pip install pipenv && \
     pipenv install --system && \
     mkdir -p /opt/models && \
-    adduser caikit && \
-    chown -R caikit:caikit /caikit /opt/models
+    adduser -g 0 -u 1001 caikit && \
+    chown -R 1001:0 /caikit /opt/models && \
+    chmod -R g=u /caikit /opt/models
 
-USER caikit
+USER 1001
 
 ENV RUNTIME_LIBRARY='caikit_nlp' \
     RUNTIME_LOCAL_MODELS_DIR='/opt/models'

From fa6d8b5b50ffbaf3f67f15466f91981964d6aea3 Mon Sep 17 00:00:00 2001
From: jooho <jlee@redhat.com>
Date: Wed, 12 Jul 2023 22:36:19 -0400
Subject: [PATCH 2/3] update envs

Signed-off-by: jooho <jlee@redhat.com>
---
 .github/workflows/pr-close-image-delete.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pr-close-image-delete.yaml b/.github/workflows/pr-close-image-delete.yaml
index 16aeca14..b4a93a64 100644
--- a/.github/workflows/pr-close-image-delete.yaml
+++ b/.github/workflows/pr-close-image-delete.yaml
@@ -5,7 +5,7 @@ on:
       - closed
 
 env:
-  QUAY_ODH_DASHBOARD_IMAGE_REPO: ${{ secrets.QUAY_ODH_CAIKIT_TGIS_SERVING_IMAGE_REPO }}
+  QUAY_ODH_CAIKIT_TGIS_SERVING_IMAGE_REPO: ${{ secrets.QUAY_ODH_CAIKIT_TGIS_SERVING_IMAGE_REPO }}
 
 jobs:
   delete-pr-quay-image:
@@ -26,10 +26,10 @@ jobs:
           QUAY_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }}
           QUAY_ROBOT_USERNAME: ${{ secrets.QUAY_ROBOT_USERNAME }}
         run: |
-         skopeo login quay.io -u ${QUAY_ROBOT_USERNAME} -p ${QUAY_TOKEN}
+         skopeo login quay.io -u "$QUAY_ROBOT_USERNAME" -p "$QUAY_TOKEN"
       - name: Delete PR image
         shell: bash
         env:
           PR: ${{ github.event.pull_request.number }}
         run: |
-          skopeo delete docker://${QUAY_CAIKIT_TGIS_SERVING_IMAGE_REPO}:pr-${{ env.PR }}
+          skopeo delete docker://${QUAY_ODH_CAIKIT_TGIS_SERVING_IMAGE_REPO}:pr-${PR}

From c2accab7ea372987f63cd5b3cf48c2fbe1b1ccb0 Mon Sep 17 00:00:00 2001
From: jooho <jlee@redhat.com>
Date: Thu, 13 Jul 2023 14:24:47 -0400
Subject: [PATCH 3/3] update gitaction event

Signed-off-by: jooho <jlee@redhat.com>
---
 .github/workflows/pr-close-image-delete.yaml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pr-close-image-delete.yaml b/.github/workflows/pr-close-image-delete.yaml
index b4a93a64..6f7e6377 100644
--- a/.github/workflows/pr-close-image-delete.yaml
+++ b/.github/workflows/pr-close-image-delete.yaml
@@ -1,8 +1,20 @@
 name: Delete quay image on PR closed
 on:
-  pull_request:
-    types:
-      - closed
+  pull_request_target:
+    types: [ closed ]
+    branches:
+      - 'main'
+    paths-ignore:
+      - 'LICENSE'
+      - '**/.gitignore'
+      - '**.md'
+      - '**.adoc'
+      - '*.txt'
+      - 'Makefile'
+      - '.github/**'
+      - 'docs/**'
+      - 'demo/**'
+             
 
 env:
   QUAY_ODH_CAIKIT_TGIS_SERVING_IMAGE_REPO: ${{ secrets.QUAY_ODH_CAIKIT_TGIS_SERVING_IMAGE_REPO }}