From b6e89a65cb1018546198c4a30eecd78a64bc1f50 Mon Sep 17 00:00:00 2001 From: Iain Walmsley Date: Fri, 21 Jun 2024 13:19:22 +0100 Subject: [PATCH] feat: bump to node20 (current LTS) --- .github/workflows/pr_api.yaml | 2 +- .github/workflows/pr_app.yaml | 2 +- .github/workflows/pr_authorisation.yaml | 2 +- .github/workflows/pr_chassis.yaml | 2 +- .github/workflows/pr_common.yaml | 2 +- .github/workflows/pr_docs.yaml | 2 +- .github/workflows/pr_infrastructure.yaml | 2 +- .github/workflows/pr_vulnerabilities.yaml | 2 +- .github/workflows/push.yaml | 2 +- .github/workflows/tag.yaml | 2 +- code/api.Dockerfile | 6 ++---- 11 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.github/workflows/pr_api.yaml b/.github/workflows/pr_api.yaml index 06a1d58af..e71af8d05 100644 --- a/.github/workflows/pr_api.yaml +++ b/.github/workflows/pr_api.yaml @@ -27,7 +27,7 @@ jobs: - name: Set up node uses: actions/setup-node@v2 with: - node-version: "18" + node-version: "20" - name: Validate build run: ./build/validate-build.sh ${{ env.CONTAINER }} shell: bash diff --git a/.github/workflows/pr_app.yaml b/.github/workflows/pr_app.yaml index 30ac001b8..89bea730c 100644 --- a/.github/workflows/pr_app.yaml +++ b/.github/workflows/pr_app.yaml @@ -27,7 +27,7 @@ jobs: - name: Set up node uses: actions/setup-node@v2 with: - node-version: "18" + node-version: "20" - name: Validate build run: ./build/validate-build.sh ${{ env.CONTAINER }} shell: bash diff --git a/.github/workflows/pr_authorisation.yaml b/.github/workflows/pr_authorisation.yaml index d9d4922e0..e87d73c1d 100644 --- a/.github/workflows/pr_authorisation.yaml +++ b/.github/workflows/pr_authorisation.yaml @@ -27,7 +27,7 @@ jobs: - name: Set up node uses: actions/setup-node@v2 with: - node-version: "18" + node-version: "20" - name: Validate build run: ./build/validate-build.sh ${{ env.CONTAINER }} shell: bash diff --git a/.github/workflows/pr_chassis.yaml b/.github/workflows/pr_chassis.yaml index 01350c915..a39996964 100644 --- a/.github/workflows/pr_chassis.yaml +++ b/.github/workflows/pr_chassis.yaml @@ -26,7 +26,7 @@ jobs: - name: Set up node uses: actions/setup-node@v2 with: - node-version: "18" + node-version: "20" - name: Validate build run: ./build/validate-build.sh ${{ env.CONTAINER }} shell: bash diff --git a/.github/workflows/pr_common.yaml b/.github/workflows/pr_common.yaml index d672314fc..fdc6a14b6 100644 --- a/.github/workflows/pr_common.yaml +++ b/.github/workflows/pr_common.yaml @@ -26,7 +26,7 @@ jobs: - name: Set up node uses: actions/setup-node@v2 with: - node-version: "18" + node-version: "20" - name: Validate build run: ./build/validate-build.sh ${{ env.CONTAINER }} shell: bash diff --git a/.github/workflows/pr_docs.yaml b/.github/workflows/pr_docs.yaml index 26ba4cb7b..262bb930d 100644 --- a/.github/workflows/pr_docs.yaml +++ b/.github/workflows/pr_docs.yaml @@ -25,7 +25,7 @@ jobs: - name: Set up node uses: actions/setup-node@v2 with: - node-version: "18" + node-version: "20" - name: Validate build run: ./build/validate-build.sh ${{ env.CONTAINER }} shell: bash diff --git a/.github/workflows/pr_infrastructure.yaml b/.github/workflows/pr_infrastructure.yaml index a4a6338cd..b624f181f 100644 --- a/.github/workflows/pr_infrastructure.yaml +++ b/.github/workflows/pr_infrastructure.yaml @@ -27,7 +27,7 @@ jobs: - name: Set up node uses: actions/setup-node@v2 with: - node-version: "18" + node-version: "20" - name: Validate build run: ./build/validate-build.sh ${{ env.CONTAINER }} shell: bash diff --git a/.github/workflows/pr_vulnerabilities.yaml b/.github/workflows/pr_vulnerabilities.yaml index accaf54b0..bd6b2e75c 100644 --- a/.github/workflows/pr_vulnerabilities.yaml +++ b/.github/workflows/pr_vulnerabilities.yaml @@ -28,7 +28,7 @@ jobs: - name: Set up node uses: actions/setup-node@v2 with: - node-version: "18" + node-version: "20" - name: Check vulnerabilities run: ./build/check-dependencies.sh shell: bash diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index feba18adf..9217b0e0b 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -35,7 +35,7 @@ jobs: - name: Set up node uses: actions/setup-node@v1 with: - node-version: "16" + node-version: "20" - name: Validate build run: ./build/validate-build.sh ${{ matrix.container }} shell: bash diff --git a/.github/workflows/tag.yaml b/.github/workflows/tag.yaml index 653a66f00..668312685 100644 --- a/.github/workflows/tag.yaml +++ b/.github/workflows/tag.yaml @@ -36,7 +36,7 @@ jobs: - name: Set up node uses: actions/setup-node@v1 with: - node-version: "18" + node-version: "20" - name: Validate build run: ./build/validate-build.sh ${{ matrix.container }} shell: bash diff --git a/code/api.Dockerfile b/code/api.Dockerfile index 42cea091b..048a1c36a 100644 --- a/code/api.Dockerfile +++ b/code/api.Dockerfile @@ -1,5 +1,5 @@ # Build library dependencies -FROM node:16.13.0-alpine as common +FROM node:20.14-alpine as common ARG LIBRARY @@ -15,12 +15,10 @@ COPY ./docker/buildLibraries . RUN ./buildLibraries # Build the service container -FROM node:lts-alpine +FROM node:20.14-alpine ARG WORKSPACE -LABEL maintainer "joshua.foster@stfc.ac.uk" - RUN mkdir -p /usr/src/app/resources && mkdir -p /usr/src/common WORKDIR /usr/src/common