diff --git a/.circleci/config.yml b/.circleci/config.yml index 43613487..4f7f857a 100644 --- a/.circleci/config.yml +++ b/.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 diff --git a/Dockerfile b/Dockerfile index 8c6d86cc..a0e36801 100644 --- a/Dockerfile +++ b/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 diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index b5d9498e..9c49d2fc 100644 --- a/docker-compose-dev.yml +++ b/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 diff --git a/docker-compose-test.yml b/docker-compose-test.yml index 4f0e1005..d7db1a5f 100644 --- a/docker-compose-test.yml +++ b/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 diff --git a/docker-compose.yml b/docker-compose.yml index 4f67e4f3..1422cfc0 100644 --- a/docker-compose.yml +++ b/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 diff --git a/package-lock.json b/package-lock.json index 8430c36e..0ff3dd40 100644 --- a/package-lock.json +++ b/package-lock.json @@ -54,7 +54,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", @@ -4416,9 +4416,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "18.11.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.5.tgz", - "integrity": "sha512-3JRwhbjI+cHLAkUorhf8RnqUbFXajvzX4q6fMn5JwkgtuwfYtRQYI3u4V92vI6NJuTsbBQWWh3RZjFsuevyMGQ==" + "version": "18.11.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz", + "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==" }, "node_modules/@types/node-fetch": { "version": "2.6.2", @@ -17426,9 +17426,9 @@ "dev": true }, "@types/node": { - "version": "18.11.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.5.tgz", - "integrity": "sha512-3JRwhbjI+cHLAkUorhf8RnqUbFXajvzX4q6fMn5JwkgtuwfYtRQYI3u4V92vI6NJuTsbBQWWh3RZjFsuevyMGQ==" + "version": "18.11.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz", + "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==" }, "@types/node-fetch": { "version": "2.6.2", diff --git a/package.json b/package.json index 3b3cd448..560942c1 100644 --- a/package.json +++ b/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", diff --git a/renovate.json b/renovate.json index bf141df7..918da04c 100644 --- a/renovate.json +++ b/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" } ] }