Merge branch 'develop' into feature/prime-2786_change_share_GPID_page…

…_wording
bcgov · Sep 27, 2024 · 62cbf4e · 62cbf4e
2 parents 48e56d4 + 9905790
commit 62cbf4e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 80 deletions.
diff --git a/.github/workflows/build-deploy-backup-dev.yml b/.github/workflows/build-deploy-backup-dev.yml
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -4,7 +4,6 @@ on:
  push:
  paths-ignore: # do NOT trigger on changes to backup service.
  - prime-database-backup/**
- - .github/workflows/build-deploy-backup-dev.yml
  branches-ignore:
  - 'develop'
  - 'test'
@@ -13,7 +12,6 @@ on:
  pull_request:
  paths-ignore:
  - prime-database-backup/**
- - .github/workflows/build-deploy-backup-dev.yml
  branches-ignore:
  - 'develop'
  - 'test'

diff --git a/prime-database-backup/openshift.dockerfile b/prime-database-backup/openshift.dockerfile
@@ -1,4 +1,4 @@
-FROM postgres:12.4
+FROM postgres:12.20
 USER 0
 ARG PGPASSWORD
 ARG PGDATABASE