Merge branch 'main' into renovate/bcgov-nr-action-builder-ghcr-2.x

.github/workflows/analysis.yml

@@ -3,8 +3,10 @@ name: Analysis
 on:
   push:
     branches: [main]
+  pull_request:
+    types: [opened, reopened, synchronize, ready_for_review]
   schedule: [cron: "0 11 * * 0"] # 3 AM PST = 12 PM UDT, runs sundays
-  workflow_call:
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -14,6 +16,7 @@ jobs:
   # https://github.com/marketplace/actions/aqua-security-trivy
   trivy:
     name: Trivy
+    if: github.event_name != 'pull_request' || !github.event.pull_request.draft
     runs-on: ubuntu-22.04
     timeout-minutes: 1
     steps:

.github/workflows/pr-open.yml

@@ -19,34 +19,75 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        package: [bitnami/postgresql, bitnami/postgresql-ha, postgres]
-        tag: [12, 13, 14, 15, 16]
         include:
           - package: bitnami/pgpool
-            tag: 4
+            major_tag: 4
+          - package: bitnami/postgresql
+            major_tag: 12
+          - package: bitnami/postgresql
+            major_tag: 13
+          - package: bitnami/postgresql
+            major_tag: 14
+          - package: bitnami/postgresql
+            major_tag: 15
+          - package: bitnami/postgresql
+            major_tag: 16
+          - package: bitnami/postgresql-ha
+            major_tag: 12
+          - package: bitnami/postgresql-ha
+            major_tag: 13
+          - package: bitnami/postgresql-ha
+            major_tag: 14
+          - package: bitnami/postgresql-ha
+            major_tag: 15
+          - package: bitnami/postgresql-ha
+            major_tag: 16
           - package: mongo
-            tag: 6
+            major_tag: 6
           - package: mongo
-            tag: 7
+            major_tag: 7
+          - package: postgres
+            major_tag: 12
+          - package: postgres
+            major_tag: 13
+          - package: postgres
+            major_tag: 14
+          - package: postgres
+            major_tag: 15
+          - package: postgres
+            major_tag: 16
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
       - name: Get tag
         id: tag
         run: |
-          TAG=$(grep '^FROM' ${{ matrix.package }}/${{ matrix.tag }}/Dockerfile | cut -d':' -f2)
-          echo "tag=${TAG}" >> $GITHUB_OUTPUT
+          TAG=$(grep '^FROM' ${{ matrix.package }}/${{ matrix.major_tag }}/Dockerfile | cut -d':' -f2)
+          echo "full_tag=${TAG}" >> $GITHUB_OUTPUT
 
       - name: Build or import
         uses: bcgov-nr/[email protected]
         with:
-          build_context: ${{ matrix.package }}/${{ matrix.tag }}
+          build_context: ${{ matrix.package }}/${{ matrix.major_tag }}
           package: ${{ matrix.package }}
-          tag: ${{ steps.tag.outputs.tag }}
+          tag: ${{ steps.tag.outputs.full_tag }}
           token: ${{ github.token }}
           triggers: ${{ matrix.package}}/${{ matrix.triggers }}
 
-  analysis:
-    name: Analysis
+  pr-description-add:
+    name: PR Description Add
     needs: [builds]
-    uses: ./.github/workflows/analysis.yml
+    runs-on: ubuntu-22.04
+    permissions:
+      pull-requests: write
+    timeout-minutes: 1
+    steps:
+      - uses: bcgov-nr/[email protected]
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          add_markdown: |
+            ---
+
+            Thanks for the PR!
+
+            Any new images should be viewable with [our repo packages](https://github.com/orgs/bcgov/packages?repo_name=nr-containers).  :)

postgres/15/Dockerfile

@@ -1,4 +1,4 @@
-FROM postgres:15.4
+FROM postgres:15.5
 
 # Health check and non-privileged user
 HEALTHCHECK --interval=15s --timeout=5s --retries=3 CMD [ "pg_isready" ]