diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e625401468a..76f3e1d827a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,7 +52,7 @@ jobs: strategy: # Create a matrix of Node versions to test against (in parallel) matrix: - node-version: [18.x, 20.x] + node-version: [20.x, 22.x] # Do NOT exit immediately if one matrix job fails fail-fast: false # These are the actual CI steps to perform per job @@ -100,7 +100,7 @@ jobs: # NOTE: Angular CLI only supports code coverage for specs. See https://github.com/angular/angular-cli/issues/6286 - name: Upload code coverage report to Artifact uses: actions/upload-artifact@v4 - if: matrix.node-version == '18.x' + if: matrix.node-version == '22.x' with: name: coverage-report-${{ matrix.node-version }} path: 'coverage/dspace-angular/lcov.info' diff --git a/Dockerfile b/Dockerfile index 04404064af0..18f81e2b51a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # This image will be published as dspace/dspace-angular # See https://github.com/DSpace/dspace-angular/tree/main/docker for usage details -FROM docker.io/node:18-alpine +FROM docker.io/node:22-alpine # Ensure Python and other build tools are available # These are needed to install some node modules, especially on linux/arm64 diff --git a/Dockerfile.dist b/Dockerfile.dist index 26c8bf6d6ab..5f9db4d8e71 100644 --- a/Dockerfile.dist +++ b/Dockerfile.dist @@ -4,7 +4,7 @@ # Test build: # docker build -f Dockerfile.dist -t dspace/dspace-angular:dspace-7_x-dist . -FROM docker.io/node:18-alpine AS build +FROM docker.io/node:22-alpine AS build # Ensure Python and other build tools are available # These are needed to install some node modules, especially on linux/arm64 @@ -17,7 +17,7 @@ RUN yarn install --network-timeout 300000 ADD . /app/ RUN yarn build:prod -FROM node:18-alpine +FROM node:22-alpine RUN npm install --global pm2 COPY --chown=node:node --from=build /app/dist /app/dist