From 0fdf742dabcb8c8c0c70cfe32ecb22c11a959300 Mon Sep 17 00:00:00 2001 From: Siting Ren Date: Mon, 17 Jun 2024 10:27:21 +0800 Subject: [PATCH] Update Devcontainer (#149) --- .devcontainer/Dockerfile | 2 +- .devcontainer/devcontainer.json | 21 +++++++++------------ .devcontainer/docker-compose.yml | 4 ++-- .github/workflows/ci.yml | 3 +-- README.md | 2 +- packages/vertica-nodejs/README.md | 2 +- 6 files changed, 15 insertions(+), 19 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 36305f21..93a936be 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -3,7 +3,7 @@ # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information. #------------------------------------------------------------------------------------------------------------- -FROM node:12 +FROM node:20 # Avoid warnings by switching to noninteractive ENV DEBIAN_FRONTEND=noninteractive diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 05cf1ae6..ab87f515 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,16 +1,10 @@ // If you want to run as a non-root user in the container, see .devcontainer/docker-compose.yml. { - "name": "Node.js 12 & Vertica", + "name": "Node.js 20 & Vertica", "dockerComposeFile": "docker-compose.yml", - "service": "web", + "service": "nodejs", "workspaceFolder": "/workspace", - // Use 'settings' to set *default* container specific settings.json values on container create. - // You can edit these settings after create using File > Preferences > Settings > Remote. - "settings": { - "terminal.integrated.shell.linux": "/bin/bash" - }, - // Uncomment the next line if you want start specific services in your Docker Compose config. // "runServices": [], @@ -24,8 +18,11 @@ // https://aka.ms/vscode-remote/containers/non-root for details on adding a non-root user if none exist. // "remoteUser": "node", - // Add the IDs of extensions you want installed when the container is created in the array below. - "extensions": [ - "dbaeumer.vscode-eslint" - ] + "customizations": { + // Configure properties specific to VS Code. + "vscode": { + "settings": {"terminal.integrated.shell.linux": "/bin/bash"}, + "extensions": ["dbaeumer.vscode-eslint"] + } + } } \ No newline at end of file diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 7164f052..a6f7dff7 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -5,7 +5,7 @@ version: '3' services: - web: + nodejs: # Uncomment the next line to use a non-root user for all processes. You can also # simply use the "remoteUser" property in devcontainer.json if you just want VS Code # and its sub-processes (terminals, tasks, debugging) to execute as the user. On Linux, @@ -29,7 +29,7 @@ services: - db db: - image: vertica/vertica-ce:latest + image: opentext/vertica-ce:latest restart: unless-stopped ports: - "5433:5433" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e0e07065..21aba809 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,12 +26,11 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - #node: ['8', '10', '12', '14', '16', '17'] #os: [ubuntu-latest, windows-latest, macos-latest] # let's make it a little bit simple for now # current minimal version will be 12. # TODO: investigate the multipe version matrix with single Vertica instance - node: ['12', '13', '14', '15', '16', '17'] + node: ['12', '14', '16', '18', '20'] os: [ubuntu-latest] name: Node.js ${{ matrix.node }} (${{ matrix.os }}) steps: diff --git a/README.md b/README.md index 642b94fd..b966af72 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![NPM downloads](https://img.shields.io/npm/dm/vertica-nodejs)](https://www.npmjs.com/package/vertica-nodejs) [![test status](https://github.com/vertica/vertica-nodejs/actions/workflows/ci.yml/badge.svg)](https://github.com/vertica/vertica-nodejs/actions/workflows/ci.yml) -Non-blocking Vertica client for Node.js made with pure Javascript. +Non-blocking Vertica client for Node.js made with pure Javascript. This client has been tested with Vertica 24.2.0 and Node 12/14/16/18/20. ## Documentation diff --git a/packages/vertica-nodejs/README.md b/packages/vertica-nodejs/README.md index 69503eba..fd51edd1 100644 --- a/packages/vertica-nodejs/README.md +++ b/packages/vertica-nodejs/README.md @@ -4,7 +4,7 @@ [![NPM version](https://img.shields.io/npm/v/vertica-nodejs?color=blue)](https://www.npmjs.com/package/vertica-nodejs) [![NPM downloads](https://img.shields.io/npm/dm/vertica-nodejs)](https://www.npmjs.com/package/vertica-nodejs) -Non-blocking Vertica client for Node.js made with pure Javascript. +Non-blocking Vertica client for Node.js made with pure Javascript. This client has been tested with Vertica 24.2.0 and Node 12/14/16/18/20. ## Jump to 1. [Features](#Features)