Merge pull request #2480 from kuzzleio/chore/update-node18

Update doco, scripts, dockerfile to nodejs 18
kuzzleio · Sep 20, 2023 · 9e8884c · 9e8884c
2 parents 2ee7d41 + c15cf43
commit 9e8884c
Show file tree

Hide file tree

Showing 14 changed files with 50 additions and 29 deletions.
diff --git a/.ci/scripts/run-monkey-tests.sh b/.ci/scripts/run-monkey-tests.sh
@@ -4,8 +4,8 @@ set -ex
 
 if [ -z "$NODE_VERSION" ];
 then
- echo "Missing NODE_VERSION, use default NODE_16_VERSION"
- export NODE_VERSION=$NODE_16_VERSION
+ echo "Missing NODE_VERSION, use default NODE_18_VERSION"
+ export NODE_VERSION=$NODE_18_VERSION
 fi
 
 echo "Testing Kuzzle against node v$NODE_VERSION"

diff --git a/.ci/scripts/run-test-arm.sh b/.ci/scripts/run-test-arm.sh
@@ -4,8 +4,8 @@ set -ex
 
 if [ -z "$NODE_VERSION" ];
 then
- echo "Missing NODE_VERSION, use default NODE_16_VERSION"
- NODE_VERSION=$NODE_16_VERSION
+ echo "Missing NODE_VERSION, use default NODE_18_VERSION"
+ NODE_VERSION=$NODE_18_VERSION
 fi
 
 echo "Testing Kuzzle against node v$NODE_VERSION"

diff --git a/.ci/scripts/run-test-cluster.sh b/.ci/scripts/run-test-cluster.sh
@@ -5,8 +5,8 @@ set -ex
 
 if [ -z "$NODE_VERSION" ];
 then
- echo "Missing NODE_VERSION, use default NODE_16_VERSION"
- export NODE_VERSION=$NODE_16_VERSION
+ echo "Missing NODE_VERSION, use default NODE_18_VERSION"
+ export NODE_VERSION=$NODE_18_VERSION
 fi
 
 echo "Testing Kuzzle against node v$NODE_VERSION"

diff --git a/.ci/scripts/run-test.sh b/.ci/scripts/run-test.sh
@@ -4,8 +4,8 @@ set -ex
 
 if [ -z "$NODE_VERSION" ];
 then
- echo "Missing NODE_VERSION, use default NODE_16_VERSION"
- NODE_VERSION=$NODE_16_VERSION
+ echo "Missing NODE_VERSION, use default NODE_18_VERSION"
+ NODE_VERSION=$NODE_18_VERSION
 fi
 
 echo "Testing Kuzzle against node v$NODE_VERSION"

diff --git a/doc/2/api/controllers/server/health-check/index.md b/doc/2/api/controllers/server/health-check/index.md
@@ -17,7 +17,7 @@ Returns the status of Kuzzle and it's internal services.
 ### HTTP
 
 ```http
-URL: http://kuzzle:7512/_healthCheck[?services]
+URL: http://kuzzle:7512/_healthcheck[?services]
 Method: GET
 ```
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -36,8 +36,6 @@ x-kuzzle-config: &kuzzle-config
  - KUZZLE_VAULT_KEY=${KUZZLE_VAULT_KEY:-secret-password}
  - KUZZLE_SECRETS_FILE=${KUZZLE_SECRETS_FILE:-/var/app/features/fixtures/secrets.enc.json}
  # Variables used by the development scripts
- - NODE_12_VERSION=12.20.0
- - NODE_14_VERSION=14.17.0
  - NODE_16_VERSION=16.19.1
  - NODE_18_VERSION=18.17.0
  - NODE_20_VERSION=20.0.0
@@ -65,7 +63,7 @@ services:
  - '1883:1883' # Kuzzle MQTT port
  - '9229:9229' # Debug port
  healthcheck:
- test: ['CMD', 'curl', '-f', 'http://kuzzle:7512/_healthCheck']
+ test: ['CMD', 'curl', '-f', 'http://kuzzle:7512/_healthcheck']
  timeout: 1s
  interval: 2s
  retries: 10
@@ -78,7 +76,7 @@ services:
  - '11883:1883' # Kuzzle MQTT port
  - '9230:9229' # Debug port
  healthcheck:
- test: ['CMD', 'curl', '-f', 'http://kuzzle:7512/_healthCheck']
+ test: ['CMD', 'curl', '-f', 'http://kuzzle:7512/_healthcheck']
  timeout: 1s
  interval: 2s
  retries: 10
@@ -91,7 +89,7 @@ services:
  - '11884:1883' # Kuzzle MQTT port
  - '9231:9229' # Debug port
  healthcheck:
- test: ['CMD', 'curl', '-f', 'http://kuzzle:7512/_healthCheck']
+ test: ['CMD', 'curl', '-f', 'http://kuzzle:7512/_healthcheck']
  timeout: 1s
  interval: 2s
  retries: 10

diff --git a/docker/docker-compose-swarm.yml b/docker/docker-compose-swarm.yml
@@ -34,7 +34,7 @@ services:
  sysctls:
  - net.core.somaxconn=8192
  healthcheck:
- test: ["CMD", "curl", "-f", "http://localhost:7512/_healthCheck"]
+ test: ["CMD", "curl", "-f", "http://localhost:7512/_healthcheck"]
  timeout: 1s
  interval: 2s
  retries: 30
@@ -47,7 +47,7 @@ services:
  - "traefik.enable=true"
  # Kuzzle HTTP/WS
  - "traefik.http.services.kuzzle_http.loadbalancer.server.port=7512"
- - "traefik.http.services.kuzzle_http.loadbalancer.healthCheck.path=/_healthCheck"
+ - "traefik.http.services.kuzzle_http.loadbalancer.healthCheck.path=/_healthcheck"
  - "traefik.http.services.kuzzle_http.loadbalancer.healthCheck.interval=5s"
  - "traefik.http.routers.kuzzle.entrypoints=kuzzle_http"
  - "traefik.http.routers.kuzzle.rule=Host(`localhost`)"

diff --git a/docker/images/kuzzle/Dockerfile b/docker/images/kuzzle/Dockerfile
@@ -1,7 +1,7 @@
 ################################################################################
 # Production build image
 ################################################################################
-FROM node:16-bullseye-slim as builder
+FROM node:18-bullseye-slim as builder
 
 RUN set -x \
  && apt-get update \
@@ -45,7 +45,7 @@ RUN set -x \
 ################################################################################
 # Production build 2 image
 ################################################################################
-FROM node:16-bullseye-slim as minifier
+FROM node:18-bullseye-slim as minifier
 
 ENV NODE_ENV=production
 

diff --git a/docker/images/kuzzle/README.md b/docker/images/kuzzle/README.md
@@ -10,7 +10,7 @@ You should use this image as a base build your own application:
 
 ```dockerfile
 # Build image
-FROM node:12.18.1-alpine3.11 as builder
+FROM node:18-bullseye-slim as builder
 
 ADD . /your-plugin-name
 

diff --git a/docker/images/plugin-dev/Dockerfile b/docker/images/plugin-dev/Dockerfile
@@ -1,7 +1,7 @@
 ################################################################################
 # Plugin development build image
 ################################################################################
-FROM node:16-bullseye-slim as builder
+FROM node:18-bullseye-slim as builder
 
 RUN set -x \
  && apt-get update && apt-get install -y \

diff --git a/docker/images/plugin-dev/README.md b/docker/images/plugin-dev/README.md
@@ -18,6 +18,7 @@ version: '3'
 services:
  kuzzle:
  image: kuzzleio/plugin-dev:2
+ container_name: kuzzle_node
  volumes:
  - ".:/var/app/plugins/enabled/your-plugin-name"
  cap_add:
@@ -40,12 +41,33 @@ services:
  - DEBUG=kuzzle:plugins
  # Customize here
  - KUZZLE_PLUGIN_NAME=your-plugin-name
+ healthcheck:
+ test: ['CMD', 'curl', '-f', 'http://kuzzle:7512/_healthcheck']
+ timeout: 1s
+ interval: 2s
+ retries: 10
 
  redis:
  image: redis:6
+ container_name: kuzzle_redis
+ ports:
+ - '6379:6379'
+ healthcheck:
+ test: ['CMD', 'redis-cli', 'ping']
+ interval: 1s
+ timeout: 3s
+ retries: 30
 
  elasticsearch:
  image: kuzzleio/elasticsearch:7
+ container_name: kuzzle_elasticsearch
+ ports:
+ - '9200:9200'
+ healthcheck:
+ test: ['CMD', 'curl', '-f', 'http://localhost:9200']
+ interval: 2s
+ timeout: 2s
+ retries: 10
  ulimits:
  nofile: 65536
 ```

diff --git a/docker/scripts/docker-compose.test.yml b/docker/scripts/docker-compose.test.yml
@@ -37,8 +37,9 @@ x-kuzzle-config: &kuzzle-config
  - KUZZLE_VAULT_KEY=${KUZZLE_VAULT_KEY:-secret-password}
  - KUZZLE_SECRETS_FILE=${KUZZLE_SECRETS_FILE:-/var/app/features/fixtures/secrets.enc.json}
  # Variables used by the development scripts
- - NODE_12_VERSION=12.20.0
- - NODE_14_VERSION=14.17.0
+ - NODE_16_VERSION=16.19.1
+ - NODE_18_VERSION=18.17.0
+ - NODE_20_VERSION=20.0.0
  - WITHOUT_KUZZLE # Run only Elasticsearch and Redis
  - REBUILD # Force a rebuild of npm modules
 
@@ -63,7 +64,7 @@ services:
  - '1883:1883' # Kuzzle MQTT port
  - '9229:9229' # Debug port
  healthcheck:
- test: ['CMD', 'curl', '-f', 'http://kuzzle:7512/_healthCheck']
+ test: ['CMD', 'curl', '-f', 'http://kuzzle:7512/_healthcheck']
  timeout: 1s
  interval: 2s
  retries: 10
@@ -76,7 +77,7 @@ services:
  - '11883:1883' # Kuzzle MQTT port
  - '9230:9229' # Debug port
  healthcheck:
- test: ['CMD', 'curl', '-f', 'http://kuzzle:7512/_healthCheck']
+ test: ['CMD', 'curl', '-f', 'http://kuzzle:7512/_healthcheck']
  timeout: 1s
  interval: 2s
  retries: 10
@@ -89,7 +90,7 @@ services:
  - '11884:1883' # Kuzzle MQTT port
  - '9231:9229' # Debug port
  healthcheck:
- test: ['CMD', 'curl', '-f', 'http://kuzzle:7512/_healthCheck']
+ test: ['CMD', 'curl', '-f', 'http://kuzzle:7512/_healthcheck']
  timeout: 1s
  interval: 2s
  retries: 10

diff --git a/docker/scripts/run-dev.sh b/docker/scripts/run-dev.sh
@@ -8,8 +8,8 @@ fi
 
 if [ -z "$NODE_VERSION" ];
 then
- echo "Missing NODE_VERSION, use default $NODE_14_VERSION"
- n $NODE_14_VERSION
+ echo "Missing NODE_VERSION, use default $NODE_18_VERSION"
+ n $NODE_18_VERSION
 fi
 
 if [ -n "$TRAVIS" ] || [ -n "$REBUILD" ]; then

diff --git a/docker/scripts/run-test.sh b/docker/scripts/run-test.sh
@@ -8,8 +8,8 @@ fi
 
 if [ -z "$NODE_VERSION" ];
 then
- echo "Missing NODE_VERSION, use default $NODE_14_VERSION"
- n $NODE_14_VERSION
+ echo "Missing NODE_VERSION, use default $NODE_18_VERSION"
+ n $NODE_18_VERSION
 fi
 
 if [ -n "$TRAVIS" ] || [ -n "$REBUILD" ]; then