Sync changes from hmpps-template-typescript and update dependencies (#…

…319)

* Use official redis image for docker-compose (hmpps-template-typescript#126)

Which is suitable for arm64 and consistent with docker-compose-test which was updated with ministryofjustice/hmpps-template-typescript#89

* Match CI version of redis to that selected in docker compose conf

* Set helm timeout to 7 minutes (hmpps-template-typescript#125)

* Use node v18.12 throughout which is the first LTS revision of v18

Co-authored-by: Neil Mendum <[email protected]>
Co-authored-by: carlov20 <[email protected]>

.circleci/config.yml

@@ -15,7 +15,7 @@ parameters:
 
   node-version:
     type: string
-    default: 18.11-browsers
+    default: 18.12-browsers
 
   python-version:
     type: string
@@ -25,8 +25,8 @@ executors:
   # same as hmpps/node_redis executor with the addition of minio containers
   integration-tests:
     docker:
-      - image: cimg/node:18.11-browsers
-      - image: cimg/redis:5.0
+      - image: cimg/node:18.12-browsers
+      - image: cimg/redis:6.2
       - image: minio/minio
         command: server --address :9000 /data
         environment:
@@ -209,6 +209,7 @@ workflows:
       - hmpps/deploy_env:
           name: deploy_dev
           env: "dev"
+          helm_timeout: 7m
           jira_update: true
           context: hmpps-common-vars
           filters:
@@ -233,6 +234,7 @@ workflows:
       - hmpps/deploy_env:
           name: deploy_preprod
           env: "preprod"
+          helm_timeout: 7m
           jira_update: true
           jira_env_type: staging
           context:
@@ -254,6 +256,7 @@ workflows:
       - hmpps/deploy_env:
           name: deploy_prod
           env: "prod"
+          helm_timeout: 7m
           jira_update: true
           jira_env_type: production
           slack_notification: true

Dockerfile

@@ -1,5 +1,5 @@
 # Stage: base image
-FROM node:18.11-bullseye-slim as base
+FROM node:18.12-bullseye-slim as base
 
 ARG BUILD_NUMBER=1_0_0
 ARG GIT_REF=not-available

docker-compose-dev.yml

@@ -3,7 +3,7 @@ version: '3.8'
 services:
 
   redis:
-    image: bitnami/redis:5.0
+    image: redis:6.2
     networks:
       - hmpps
     container_name: inc-ui-redis

docker-compose-test.yml

@@ -3,7 +3,7 @@ version: '3.8'
 services:
 
   redis:
-    image: bitnami/redis:5.0
+    image: redis:6.2
     networks:
       - hmpps_int
     container_name: inc-ui-redis

docker-compose.yml

@@ -3,7 +3,7 @@ version: '3.8'
 services:
 
   redis:
-    image: bitnami/redis:5.0
+    image: redis:6.2
     networks:
       - hmpps
     container_name: inc-ui-redis

package.json

@@ -145,7 +145,7 @@
     "@types/jquery": "^3.5.14",
     "@types/jsdom": "^20.0.0",
     "@types/jsonwebtoken": "^8.5.9",
-    "@types/node": "^18.11.5",
+    "@types/node": "^18.11.9",
     "@types/nunjucks": "^3.2.1",
     "@types/passport": "^1.0.11",
     "@types/passport-oauth2": "^1.4.11",

renovate.json

@@ -20,22 +20,22 @@
     },
     {
       "matchDatasources": ["docker"],
-      "allowedVersions": "18.11-bullseye-slim"
+      "allowedVersions": "18.12-bullseye-slim"
     },
     {
       "matchDatasources": ["docker-compose"],
-      "matchPackageNames": ["bitnami/redis"],
-      "allowedVersions": "5.0"
+      "matchPackageNames": ["redis"],
+      "allowedVersions": "6.2"
     },
     {
       "matchDatasources": ["orb"],
       "matchPackageNames": ["cimg/node"],
-      "allowedVersions": "18.11-browsers"
+      "allowedVersions": "18.12-browsers"
     },
     {
       "matchDatasources": ["orb"],
       "matchPackageNames": ["cimg/redis"],
-      "allowedVersions": "5.0"
+      "allowedVersions": "6.2"
     }
   ]
 }