From eb1cc09e749a44de2558b3e59418a333225521a0 Mon Sep 17 00:00:00 2001 From: sotojn Date: Thu, 9 Nov 2023 14:50:38 -0700 Subject: [PATCH 1/3] update Dockefile to use node 18.18.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 78ead80ec7a..601acbbd648 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # NODE_VERSION is set by default in the config.ts, the following value will only # be used if you build images by default with docker build -ARG NODE_VERSION=18.16.0 +ARG NODE_VERSION=18.18.2 FROM terascope/node-base:${NODE_VERSION} ENV NODE_ENV production From baa2193d2856c0855e10306b0037bbaadd512839 Mon Sep 17 00:00:00 2001 From: sotojn Date: Thu, 9 Nov 2023 14:55:06 -0700 Subject: [PATCH 2/3] update workflow to use new node versions --- .github/workflows/publish-master.yml | 4 ++-- .github/workflows/publish-tag.yml | 4 ++-- .github/workflows/test.yml | 18 +++++++++--------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/publish-master.yml b/.github/workflows/publish-master.yml index 669bf226da7..61071ea755d 100644 --- a/.github/workflows/publish-master.yml +++ b/.github/workflows/publish-master.yml @@ -29,7 +29,7 @@ jobs: - name: Setup Node uses: actions/setup-node@v3 with: - node-version: 18.16.0 + node-version: 18.18.2 registry-url: 'https://registry.npmjs.org' cache: 'yarn' @@ -54,7 +54,7 @@ jobs: - name: Setup Node uses: actions/setup-node@v3 with: - node-version: 18.16.0 + node-version: 18.18.2 registry-url: 'https://registry.npmjs.org' cache: 'yarn' diff --git a/.github/workflows/publish-tag.yml b/.github/workflows/publish-tag.yml index 17e3398af4e..8279625ef16 100644 --- a/.github/workflows/publish-tag.yml +++ b/.github/workflows/publish-tag.yml @@ -26,7 +26,7 @@ jobs: - name: Setup Node uses: actions/setup-node@v3 with: - node-version: 18.16.0 + node-version: 18.18.2 registry-url: 'https://registry.npmjs.org' cache: 'yarn' @@ -42,7 +42,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [16.19.1, 18.16.0] + node-version: [16.20.2, 18.18.2] steps: # we login to docker to publish new teraslice image - name: Login to Docker Hub diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e489c736560..3b200a74650 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,7 +14,7 @@ jobs: - name: Setup Node uses: actions/setup-node@v3 with: - node-version: 18.16.0 + node-version: 18.18.2 cache: 'yarn' - name: Install and build packages @@ -32,7 +32,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [16.19.1, 18.16.0] + node-version: [16.20.2, 18.18.2] steps: - name: Check out code uses: actions/checkout@v3 @@ -57,7 +57,7 @@ jobs: # opensearch is finiky, keep testing others if it fails fail-fast: false matrix: - node-version: [16.19.1, 18.16.0] + node-version: [16.20.2, 18.18.2] search-version: [elasticsearch6, elasticsearch7, opensearch1, opensearch2] steps: - name: Check out code @@ -91,7 +91,7 @@ jobs: # opensearch is finiky, keep testing others if it fails fail-fast: false matrix: - node-version: [16.19.1, 18.16.0] + node-version: [16.20.2, 18.18.2] search-version: [elasticsearch6, elasticsearch7, opensearch1, opensearch2] steps: - name: Check out code @@ -129,7 +129,7 @@ jobs: - name: Setup Node uses: actions/setup-node@v3 with: - node-version: 18.16.0 + node-version: 18.18.2 cache: 'yarn' # we login to docker to avoid docker pull limit rates @@ -154,7 +154,7 @@ jobs: # opensearch is finiky, keep testing others if it fails fail-fast: false matrix: - node-version: [16.19.1, 18.16.0] + node-version: [16.20.2, 18.18.2] search-version: [elasticsearch6, elasticsearch7, opensearch1, opensearch2] steps: - name: Check out code @@ -193,7 +193,7 @@ jobs: - name: Setup Node uses: actions/setup-node@v3 with: - node-version: 18.16.0 + node-version: 18.18.2 cache: 'yarn' # we login to docker to avoid docker pull limit rates @@ -218,7 +218,7 @@ jobs: # opensearch is finiky, keep testing others if it fails fail-fast: false matrix: - node-version: [16.19.1, 18.16.0] + node-version: [16.20.2, 18.18.2] search-version: [elasticsearch6, elasticsearch7, opensearch1, opensearch2] steps: - name: Check out code @@ -252,7 +252,7 @@ jobs: # opensearch is finiky, keep testing others if it fails fail-fast: false matrix: - node-version: [16.19.1, 18.16.0] + node-version: [16.20.2, 18.18.2] steps: - name: Check out code uses: actions/checkout@v3 From ba1154e6288c91dc8a10e993abccf071764faf92 Mon Sep 17 00:00:00 2001 From: sotojn Date: Mon, 13 Nov 2023 13:40:50 -0700 Subject: [PATCH 3/3] update ts-scripts node versions --- packages/scripts/src/cmds/publish.ts | 6 +++--- packages/scripts/src/cmds/test.ts | 2 +- packages/scripts/src/helpers/config.ts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/scripts/src/cmds/publish.ts b/packages/scripts/src/cmds/publish.ts index 881a8abfcdd..7b4383cb390 100644 --- a/packages/scripts/src/cmds/publish.ts +++ b/packages/scripts/src/cmds/publish.ts @@ -23,9 +23,9 @@ const cmd: CommandModule = { .example('$0 publish', '-t tag docker') .example('$0 publish', '-t dev docker') .example('$0 publish', '-t latest docker') - .example('$0 publish', '-n 18.16.0 -t latest docker') + .example('$0 publish', '-n 18.18.2 -t latest docker') .example('$0 publish', '--dry-run docker') - .example('$0 publish', '-n 18.16.0 --dry-run docker') + .example('$0 publish', '-n 18.18.2 --dry-run docker') .example('$0 publish', '-t tag npm') .example('$0 publish', '-t latest npm') .example('$0 publish', '--dry-run npm') @@ -49,7 +49,7 @@ const cmd: CommandModule = { }) .option('node-version', { alias: 'n', - description: 'Node version, there must be a Docker base image with this version (e.g. 18.16.0)', + description: 'Node version, there must be a Docker base image with this version (e.g. 18.18.2)', type: 'string', default: NODE_VERSION }) diff --git a/packages/scripts/src/cmds/test.ts b/packages/scripts/src/cmds/test.ts index b76efb9d6ae..7424071cbbf 100644 --- a/packages/scripts/src/cmds/test.ts +++ b/packages/scripts/src/cmds/test.ts @@ -122,7 +122,7 @@ const cmd: CommandModule = { default: config.OPENSEARCH_VERSION, }) .option('node-version', { - description: 'Node version, there must be a Docker base image with this version (e.g. 18.16.0)', + description: 'Node version, there must be a Docker base image with this version (e.g. 18.18.2)', type: 'string', default: config.NODE_VERSION }) diff --git a/packages/scripts/src/helpers/config.ts b/packages/scripts/src/helpers/config.ts index 88fb18fa454..730f28f49d2 100644 --- a/packages/scripts/src/helpers/config.ts +++ b/packages/scripts/src/helpers/config.ts @@ -187,6 +187,6 @@ export const SEARCH_TEST_HOST = testHost; // This should match a node version from the base-docker-image repo: // https://github.com/terascope/base-docker-image // This overrides the value in the Dockerfile -export const NODE_VERSION = process.env.NODE_VERSION || '18.16.0'; +export const NODE_VERSION = process.env.NODE_VERSION || '18.18.2'; export const { TEST_PLATFORM = 'native' } = process.env;