diff --git a/.github/workflows/on-pr-and-trunk_one-app-unit-and-lint-tests.yml b/.github/workflows/on-pr-and-trunk_one-app-unit-and-lint-tests.yml index 2bf6cc813..d98ca31ba 100644 --- a/.github/workflows/on-pr-and-trunk_one-app-unit-and-lint-tests.yml +++ b/.github/workflows/on-pr-and-trunk_one-app-unit-and-lint-tests.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [18.x, 20.10.0] + node-version: [18.x, 20.8.1] steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.nvmrc b/.nvmrc index d5a159609..6569dfa4f 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -20.10.0 +20.8.1 diff --git a/Dockerfile b/Dockerfile index e0f58a472..7d65342eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ -ARG VERSION=20.10.0 +ARG VERSION=lts # Use the pre-baked fat node image only in the builder # which includes build utils preinstalled (e.g. gcc, make, etc). # This will result in faster and reliable One App docker image # builds as we do not have to run apk installs for alpine. -FROM node:$VERSION as builder +FROM node:$VERSION-alpine as builder WORKDIR /opt/build RUN npm install -g npm@9.9.3 --registry=https://registry.npmjs.org COPY --chown=node:node ./ /opt/build diff --git a/one-app-statics/package.json b/one-app-statics/package.json index 1ad03c871..63cbf8a96 100644 --- a/one-app-statics/package.json +++ b/one-app-statics/package.json @@ -1,6 +1,6 @@ { "name": "@americanexpress/one-app-statics", - "version": "6.13.0-node-20-10-0.1", + "version": "6.13.0-node-20-10-0.2", "description": "One App Static Assets", "main": "index.js", "scripts": { diff --git a/package-lock.json b/package-lock.json index cde149f49..6aa48fe49 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@americanexpress/one-app", - "version": "6.13.0-node-20-10-0.1", + "version": "6.13.0-node-20-10-0.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@americanexpress/one-app", - "version": "6.13.0-node-20-10-0.1", + "version": "6.13.0-node-20-10-0.2", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { @@ -134,7 +134,7 @@ "webdriverio": "^7.36.0" }, "engines": { - "node": ">=18 <=20.10.0", + "node": ">=18 <=20.8.1", "npm": ">=9" } }, diff --git a/package.json b/package.json index e8446e3d5..23d9507ba 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,10 @@ { "name": "@americanexpress/one-app", - "version": "6.13.0-node-20-10-0.1", + "version": "6.13.0-node-20-10-0.2", "description": "One Amex SPA technology stack.", "main": "index.js", "engines": { - "node": ">=18 <=20.10.0", + "node": ">=18 <=20.8.1", "npm": ">=9" }, "scripts": { diff --git a/prod-sample/api/Dockerfile b/prod-sample/api/Dockerfile index 898deb1c3..8f0e50a78 100644 --- a/prod-sample/api/Dockerfile +++ b/prod-sample/api/Dockerfile @@ -1,6 +1,6 @@ -ARG VERSION=20.10.0 +ARG VERSION=lts -FROM node:$VERSION as builder +FROM node:$VERSION-alpine as builder MAINTAINER One App Team WORKDIR /