feat: node consistency (#1355)

bcgov · Sep 12, 2023 · 9c12a8e · 9c12a8e
1 parent 5fcac58
commit 9c12a8e
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 134 deletions.
diff --git a/.github/workflows/merge-main.yml b/.github/workflows/merge-main.yml
@@ -12,45 +12,45 @@ concurrency:
 
 jobs:
   deploys-test:
-    name: TEST Deployments
+    name: TEST Deploys
     environment: test
     runs-on: ubuntu-22.04
     strategy:
       matrix:
         name:
-          - backend
-          - database
-          - frontend
           - init
+          - database
+          - backend
+          - backend-go
           - backend-java
           - backend-py
-          - backend-go
+          - frontend
         include:
+          - name: init
+            file: common/openshift.init.yml
+            overwrite: false
+          - name: database
+            file: database/openshift.deploy.yml
+            overwrite: false
           - name: backend
             file: backend/openshift.deploy.yml
             parameters: -p PROMOTE_MIGRATION=${{ github.repository }}/database-migrations:test
             overwrite: true
             verification_path: /api
-          - name: database
-            file: database/openshift.deploy.yml
-            overwrite: false
-          - name: frontend
-            file: frontend/openshift.deploy.yml
+          - name: backend-go
+            file: backend-go/openshift.deploy.yml
+            overwrite: true
+            parameters: -p PROMOTE_MIGRATION=${{ github.repository }}/database-migrations-go:test
+          - name: backend-java
+            file: backend-java/openshift.deploy.yml
             overwrite: true
-          - name: init
-            file: common/openshift.init.yml
-            overwrite: false
           - name: backend-py
             file: backend-py/openshift.deploy.yml
             overwrite: true
             parameters: -p PROMOTE_MIGRATION=${{ github.repository }}/database-migrations-py:test
-          - name: backend-java
-            file: backend-java/openshift.deploy.yml
-            overwrite: true
-          - name: backend-go
-            file: backend-go/openshift.deploy.yml
+          - name: frontend
+            file: frontend/openshift.deploy.yml
             overwrite: true
-            parameters: -p PROMOTE_MIGRATION=${{ github.repository }}/database-migrations-go:test
     steps:
       - uses: bcgov-nr/[email protected]
         with:
@@ -168,24 +168,16 @@ jobs:
           - database-migrations-go
           - database-migrations-py
     steps:
-      - name: Delete all untagged
-        uses: actions/delete-package-versions@v4
-        with:
-          package-name: "${{ github.event.repository.name }}/${{ matrix.name }}"
-          package-type: "container"
-          min-versions-to-keep: 0
-          delete-only-untagged-versions: "true"
-
       - name: Keep last 10
         uses: actions/delete-package-versions@v4
         with:
           package-name: "${{ github.event.repository.name }}/${{ matrix.name }}"
           package-type: "container"
-          min-versions-to-keep: 10
+          min-versions-to-keep: 20
           ignore-versions: "^(prod|test)$"
 
   deploys-prod:
-    name: PROD Deployments
+    name: PROD Deploys
     needs: [integration-tests, cypress-e2e]
     environment: prod
     runs-on: ubuntu-22.04

diff --git a/backend/Dockerfile b/backend/Dockerfile
@@ -1,4 +1,5 @@
-FROM node:20-bullseye-slim AS build
+# Build static files
+FROM node:20.6.1-bullseye-slim AS build
 
 # Install packages, build and keep only prod packages
 WORKDIR /app
@@ -7,8 +8,7 @@ COPY ./src ./src
 RUN npm ci --omit=dev --ignore-scripts && \
     npm run build
 
-
-# Deployment container
+# Deploy container
 FROM gcr.io/distroless/nodejs20-debian11:nonroot
 ENV NODE_ENV production
 

diff --git a/database/Dockerfile b/database/Dockerfile
@@ -4,8 +4,6 @@ FROM postgres:15
 # RUN sed -i '/EXISTS postgis_tiger_geocoder;*/a CREATE EXTENSION IF NOT EXISTS pgcrypto;' \
 #       /docker-entrypoint-initdb.d/10_postgis.sh
 
-# Health check - recommended for local dev
+# Health check and non-privileged user
 HEALTHCHECK --interval=15s --timeout=5s --retries=3 CMD [ "pg_isready" ]
-
-# Non-privileged user
 USER postgres
diff --git a/database/postgis/Dockerfile b/database/postgis/Dockerfile
@@ -4,8 +4,6 @@ FROM postgis/postgis:15-master
 # RUN sed -i '/EXISTS postgis_tiger_geocoder;*/a CREATE EXTENSION IF NOT EXISTS pgcrypto;' \
 #       /docker-entrypoint-initdb.d/10_postgis.sh
 
-# Health check - recommended for local dev
+# Health check and non-privileged user
 HEALTHCHECK --interval=15s --timeout=5s --retries=3 CMD [ "pg_isready" ]
-
-# Non-privileged user
 USER postgres
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
@@ -1,9 +1,11 @@
 # Build static files
-FROM node:alpine3.16 AS build
+FROM node:20.6.1-bullseye-slim AS build
 
+# Install packages, build and keep only prod packages
 WORKDIR /app
-COPY . .
-RUN npm ci --ignore-scripts && \
+COPY *.json *.ts index.html ./
+COPY ./src ./src
+RUN npm ci --omit=dev --ignore-scripts && \
     npm run build
 
 # Caddy