Merge branch 'main' into renovate/lock-file-maintenance

bcgov · Oct 30, 2023 · a4c3f35 · a4c3f35
2 parents 6487096 + d414b07
commit a4c3f35
Show file tree

Hide file tree

Showing 5 changed files with 380 additions and 28 deletions.
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -19,12 +19,11 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        name: [database, backend-go, backend-java, backend-py, frontend]
+        name: [database, backend-go, backend-java, backend-py]
         include:
           - name: database
             file: database/openshift.deploy.yml
             overwrite: false
-            repository: bcgov/quickstart-openshift
           - name: backend-go
             file: backend-go/openshift.deploy.yml
             overwrite: true
@@ -36,10 +35,6 @@ jobs:
             file: backend-py/openshift.deploy.yml
             overwrite: true
             parameters: -p PROMOTE_MIGRATION=${{ github.repository }}/migrations-py:test
-          - name: frontend
-            file: frontend/openshift.deploy.yml
-            overwrite: true
-            repository: bcgov/quickstart-openshift
     steps:
       - uses: bcgov-nr/action-deployer-openshift@v2.0.0
         with:
@@ -121,12 +116,11 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        name: [database, backend-go, backend-java, backend-py, frontend]
+        name: [database, backend-go, backend-java, backend-py]
         include:
           - name: database
             file: database/openshift.deploy.yml
             overwrite: false
-            repository: bcgov/quickstart-openshift
           - name: backend-go
             file: backend-go/openshift.deploy.yml
             overwrite: true
@@ -141,11 +135,6 @@ jobs:
             overwrite: true
             parameters: -p MIN_REPLICAS=1 -p MAX_REPLICAS=2
               -p PROMOTE_MIGRATION=${{ github.repository }}/migrations-py:test
-          - name: frontend
-            file: frontend/openshift.deploy.yml
-            overwrite: true
-            parameters: -p MIN_REPLICAS=1 -p MAX_REPLICAS=2
-            repository: bcgov/quickstart-openshift
     steps:
       - uses: bcgov-nr/action-deployer-openshift@v2.0.0
         with:

diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
@@ -31,7 +31,6 @@ jobs:
             Thanks for the PR!
 
             Deployments, as required, will be available below:
-            - [Frontend](https://${{ env.PREFIX }}-frontend.${{ env.DOMAIN }})
             - [Backend](https://${{ env.PREFIX }}-backend.${{ env.DOMAIN }})
             - [Backend-java](https://${{ env.PREFIX }}-backend-java.${{ env.DOMAIN }})
             - [Backend-py](https://${{ env.PREFIX }}-backend-py.${{ env.DOMAIN }})
@@ -53,10 +52,10 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        package: [database, backend-go, backend-java, backend-py, migrations-go, migrations-py, frontend]
+        package: [database, backend-go, backend-java, backend-py, migrations-go, migrations-py]
         include:
           - package: database
-            repository: bcgov/quickstart-openshift
+            triggers: ('database/')
           - package: backend-go
             triggers: ('backend-go/')
           - package: backend-java
@@ -69,8 +68,6 @@ jobs:
           - package: migrations-go
             triggers: ('backend-go/db')
             build_context: ./backend-go/db
-          - package: frontend
-            repository: bcgov/quickstart-openshift
     steps:
       - uses: bcgov-nr/action-builder-ghcr@v1.3.0
         with:
@@ -92,13 +89,12 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        name: [database, backend-go, backend-java, backend-py, frontend]
+        name: [database, backend-go, backend-java, backend-py]
         include:
           - name: database
             file: database/openshift.deploy.yml
             overwrite: false
-            repository: bcgov/quickstart-openshift
-            triggers: ('backend-go' 'backend-java' 'backend-py')
+            triggers: ('database' 'backend-go' 'backend-java' 'backend-py')
           - name: backend-go
             file: backend-go/openshift.deploy.yml
             overwrite: true
@@ -119,12 +115,6 @@ jobs:
               -p PROMOTE=${{ github.repository }}/backend-py:${{ github.event.number }}
               -p PROMOTE_MIGRATION=${{ github.repository }}/migrations-py:${{ github.event.number }}
             triggers: ('backend-py/')
-          - name: frontend
-            file: frontend/openshift.deploy.yml
-            overwrite: true
-            parameters: -p MIN_REPLICAS=1 -p MAX_REPLICAS=2
-            repository: bcgov/quickstart-openshift
-            triggers: ('database/' 'backend/' 'frontend/')
     steps:
       - uses: bcgov-nr/action-deployer-openshift@v2.0.0
         with:

diff --git a/database/Dockerfile b/database/Dockerfile
@@ -0,0 +1,5 @@
+FROM ghcr.io/bcgov/nr-containers/postgres:15.4
+
+# Health check and non-privileged user
+HEALTHCHECK --interval=15s --timeout=5s --retries=3 CMD [ "pg_isready" ]
+USER postgres