diff --git a/.drone.yml b/.drone.yml index c2cac960..87783ab9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,7 +25,7 @@ trigger: linting: &linting pull: if-not-exists - image: node:14 + image: node:18 environment: NOTIFY_KEY: USE_MOCK commands: @@ -33,7 +33,7 @@ linting: &linting unit_tests: &unit_tests pull: if-not-exists - image: node:14 + image: node:18 environment: NOTIFY_KEY: USE_MOCK commands: @@ -41,13 +41,13 @@ unit_tests: &unit_tests sonar_scanner: &sonar_scanner pull: if-not-exists - image: quay.io/ukhomeofficedigital/sonar-scanner-node:549b75f593f28da1c4a0a6f79877ec69d3b21037 + image: quay.io/ukhomeofficedigital/sonar-scanner-nodejs:latest commands: - sonar-scanner -Dproject.settings=./sonar-project.properties integration_tests: &integration_tests pull: if-not-exists - image: node:14 + image: node:18 environment: NOTIFY_KEY: USE_MOCK @@ -77,7 +77,7 @@ steps: - name: setup_deploy pull: if-not-exists - image: node:14 + image: node:18 environment: NOTIFY_KEY: USE_MOCK commands: @@ -165,7 +165,7 @@ steps: - name: setup_branch pull: if-not-exists - image: node:14 + image: node:18 environment: NOTIFY_KEY: USE_MOCK commands: @@ -229,7 +229,7 @@ steps: # Snyk & Anchore security scans which run after branch deployment to prevent blocking of PR UAT tests - name: snyk_scan pull: if-not-exists - image: node:14 + image: node:18 environment: SNYK_TOKEN: from_secret: snyk_token @@ -415,7 +415,7 @@ steps: - name: cron_snyk_scan pull: if-not-exists - image: node:14 + image: node:18 environment: SNYK_TOKEN: from_secret: snyk_token diff --git a/Dockerfile b/Dockerfile index f5e575e6..f5130e90 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,11 @@ -FROM node:14-alpine@sha256:5c33bc6f021453ae2e393e6e20650a4df0a4737b1882d389f17069dc1933fdc5 +FROM node:18-alpine@sha256:2322b1bb3917b313f2e9308395aa5c39d51b91cc92a5d4d5be6d0451fcfb4d24 USER root # Update packages as a result of Anchore security vulnerability checks RUN apk update && \ - apk add --upgrade gnutls binutils nodejs nodejs-npm apk-tools libjpeg-turbo libcurl libx11 libxml2 + apk add --upgrade gnutls binutils nodejs npm apk-tools libjpeg-turbo libcurl libx11 libxml2 + # Setup nodejs group & nodejs user RUN addgroup --system nodejs --gid 998 && \ diff --git a/docker-compose.yml b/docker-compose.yml index f5457c85..aedbd448 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,6 +8,7 @@ services: - EMAIL_HOST=maildev - EMAIL_PORT=25 - CASEWORKER_EMAIL=caseworker@gov.uk.test + - NOTIFY_KEY=hof_test-89548f6c-39cd-4acb-851c-1f4ffa2e479b-28426e56-443a-4ba4-98ed-fb576e717ed9 - REDIS_HOST=redis - REDIS_PORT=6379 - SESSION_SECRET=adsasdasd @@ -23,7 +24,7 @@ services: image: redis nginx-proxy: - image: quay.io/ukhomeofficedigital/nginx-proxy:v1.2.3 + image: quay.io/ukhomeofficedigital/nginx-proxy:latest environment: - PROXY_SERVICE_HOST=app - PROXY_SERVICE_PORT=8080 diff --git a/package.json b/package.json index 00881e8a..9fd8150f 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "description": "The General Register Office DSP form", "license": "GPL-2.0", "engines": { - "node": ">=14.15.0" + "node": ">=18.12.1" }, "repository": { "type": "git", diff --git a/yarn.lock b/yarn.lock index 0b28cd3d..ca76d8b0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3017,9 +3017,9 @@ hmac-drbg@^1.0.1: minimalistic-crypto-utils "^1.0.1" hof@^20.1.21: - version "20.1.21" - resolved "https://registry.yarnpkg.com/hof/-/hof-20.1.21.tgz#682eaf167fb4df022f64de3ede941727543c0d85" - integrity sha512-3jhssUN2eWfK9NOUFon4WiGu6SE49hoO1rSWOKVbezPQgyQHEvxGyjUQefCDXTs/MUN9F311MLvTVQUPvdg/7A== + version "20.2.2" + resolved "https://registry.yarnpkg.com/hof/-/hof-20.2.2.tgz#268feca3173010b432289d87bd8adeec89467f1d" + integrity sha512-EO4/f/Y7pO7IbxuF//vcR2dIKeay6rbZiuM+0PNj3kkxq0X6uxd17oKam7SedRXaStnbhWEjXbzFCl0S2OONvA== dependencies: aliasify "^2.1.0" bluebird "^3.7.2"