Merge pull request trustyai-explainability#20 from adolfo-ab/pr-container-build

fix: pr-container-build workflow

Author: m-misiura

.github/workflows/pr-container-build.yaml

@@ -1,12 +1,13 @@
 name: Build PR LLS Distro Container Image
 
 on:
-  pull_request:
+  pull_request_target:
     branches: [ main ]
 
 env:
   REGISTRY: quay.io
-  IMAGE_NAME: trustyai_testing/llama-stack-trustyai-fms
+  ORG: trustyai_testing
+  IMAGE_NAME: llama-stack-trustyai-fms
 
 jobs:
   build-and-push:
@@ -16,23 +17,33 @@ jobs:
       packages: write
 
     steps:
+      - name: Check labels
+        uses: mheap/github-action-required-labels@v5
+        with:
+          mode: minimum
+          count: 1
+          labels: "ok-to-test, lgtm, approved"
+
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Log in to Container Registry
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1
+        uses: redhat-actions/podman-login@v1
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ secrets.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_PASSWORD }}
 
       - name: Extract metadata
         id: meta
-        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f
+        uses: docker/metadata-action@v5
         with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          images: ${{ env.REGISTRY }}/${{ env.ORG }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=sha,prefix={{branch}}-,format=short
+            type=ref,event=pr,prefix=pr-
+            type=sha,format=short
 
       - name: Create temporary build directory
         run: |
@@ -41,7 +52,6 @@ jobs:
       - name: Copy provider code to build context
         run: |
           cp -r llama_stack_provider_trustyai_fms/ build-context/
-          cp -r providers.d/ build-context/
           cp run.yaml build-context/
           cp pyproject.toml build-context/
 
@@ -77,28 +87,26 @@ jobs:
                     # Install the local provider package
                     RUN pip install -e /opt/app-root/
           
-          RUN mkdir -p ${HOME}/.llama/providers.d ${HOME}/.cache
+          RUN mkdir -p ${HOME}/.cache
           COPY run.yaml ${APP_ROOT}/run.yaml
-          COPY providers.d/ ${HOME}/.llama/providers.d/
           
           ENTRYPOINT ["python", "-m", "llama_stack.distribution.server.server", "--config", "/opt/app-root/run.yaml"]
           EOF
-          
-      - name: Create modified provider config
-        run: |
-          mkdir -p build-context/providers.d/remote/safety
-          cat > build-context/providers.d/remote/safety/trustyai_fms.yaml << 'EOF'
-          adapter:
-            adapter_type: trustyai_fms
-            config_class: llama_stack_provider_trustyai_fms.config.FMSSafetyProviderConfig
-            module: llama_stack_provider_trustyai_fms
-          api_dependencies: ["safety"]
-          optional_api_dependencies: ["shields"]
-          EOF
-          
-      - name: Build Docker image
-        uses: docker/build-push-action@55146d969b0dff1a5c12630229609757af5b1081
+
+      - name: Build Image
+        id: build-image
+        uses: redhat-actions/buildah-build@v2
         with:
-          context: build-context
-          file: build-context/Containerfile
-          push: false
+          image: ${{ env.IMAGE_NAME }}
+          tags: ${{ steps.meta.outputs.tags }}
+          containerfiles: |
+            build-context/Containerfile
+
+      - name: Push to Image Registry
+        uses: redhat-actions/push-to-registry@v2
+        with:
+          image: ${{ steps.build-image.outputs.image }}
+          tags: ${{ steps.build-image.outputs.tags }}
+          registry: ${{ env.REGISTRY }}/${{ env.ORG }}
+          username: ${{ secrets.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_PASSWORD }}

run.yaml

@@ -17,5 +17,4 @@ providers:
             detectors:
                 regex:
                   detector_params:
-                    regex: ["email", "ssn", "credit-card", "^verypersonal$"]
-external_providers_dir: ./providers.d
+                    regex: ["email", "ssn", "credit-card", "^verypersonal$"]

sourcery.yaml

@@ -0,0 +1,3 @@
+rule_settings:
+  disable:
+    - third-party-action-not-pinned-to-commit-sha