Merge pull request #2497 from kuzzleio/fix/issue-with-ci

Using docker compose instead of docker-compose in scripts

.ci/scripts/install-aarch64-deps.sh

@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 # WARNING: This script needs to be run in sdk-cross:node8-armhf image
 # Install Kuzzle deps using cross build toolchain
-npm install --target_arch=arm64 --target_platform=linux --silent --unsafe-perm \
+npm ci --target_arch=arm64 --target_platform=linux --silent --unsafe-perm \
  --build-from-source=boost-geospatial-index \
  --build-from-source=espresso-logic-minimizer \
  --build-from-source=unix-dgram \
  --build-from-source=uws \
  --build-from-source=murmurhash-native \
  --build-from-source=dumpme \
  --build-from-source=cucumber-expressions
-npm install --only=dev --target_arch=arm64 --target_platfrom=linux --unsafe-perm --silent
+npm ci --only=dev --target_arch=arm64 --target_platfrom=linux --unsafe-perm --silent

.ci/scripts/install-armhf-deps.sh

@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 # WARNING: This script needs to be run in sdk-cross:node8-armhf image
 # Install Kuzzle deps using cross build toolchain
-npm install --target_arch=arm --target_platform=linux --silent --unsafe-perm \
+npm ci --target_arch=arm --target_platform=linux --silent --unsafe-perm \
  --build-from-source=boost-geospatial-index \
  --build-from-source=espresso-logic-minimizer \
  --build-from-source=unix-dgram \
  --build-from-source=uws \
  --build-from-source=murmurhash-native \
  --build-from-source=dumpme \
  --build-from-source=cucumber-expressions
-npm install --only=dev --target_arch=arm --target_platfrom=linux --unsafe-perm --silent
+npm ci --only=dev --target_arch=arm --target_platfrom=linux --unsafe-perm --silent

.ci/scripts/install-plugins.sh

@@ -8,7 +8,6 @@ protocols_dir="protocols/enabled"
 
 cd "$working_dir"
 
-# npm install plugins
 for target in ${plugins_dir}/* ${protocols_dir}/* ; do
  if [ -d "$target" ]; then
  echo 'Installing dependencies for ' $(basename "$target")

.ci/scripts/run-monkey-tests.sh

@@ -11,20 +11,20 @@ fi
 echo "Testing Kuzzle against node v$NODE_VERSION"
 
 echo "Installing dependencies..."
-npm install --unsafe-perm
+npm ci --unsafe-perm
 
 if [ "$REBUILD" == "true" ];
 then
- docker-compose -f ./.ci/test-cluster.yml run kuzzle_node_1 npm rebuild
+ docker compose -f ./.ci/test-cluster.yml run kuzzle_node_1 npm rebuild
 fi
 
-npm run build-ts
+npm run build
 
 echo "[$(date)] - Starting Kuzzle Cluster..."
 
-trap 'docker-compose -f ./.ci/test-cluster.yml logs' err
+trap 'docker compose -f ./.ci/test-cluster.yml logs' err
 
-docker-compose -f ./.ci/test-cluster.yml up -d
+docker compose -f ./.ci/test-cluster.yml up -d
 
 # don't wait on 7512: nginx will accept connections far before Kuzzle does
 KUZZLE_PORT=17510 ./bin/wait-kuzzle

.ci/scripts/run-test-cluster.sh

@@ -12,20 +12,20 @@ fi
 echo "Testing Kuzzle against node v$NODE_VERSION"
 
 echo "Installing dependencies..."
-npm install
+npm ci
 
 if [ "$REBUILD" == "true" ];
 then
- docker-compose -f ./.ci/test-cluster.yml run kuzzle_node_1 npm rebuild
+ docker compose -f ./.ci/test-cluster.yml run kuzzle_node_1 npm rebuild
 fi
 
-npm run build-ts
+npm run build
 
 echo "[$(date)] - Starting Kuzzle Cluster..."
 
-trap 'docker-compose -f ./.ci/test-cluster.yml logs' err
+trap 'docker compose -f ./.ci/test-cluster.yml logs' err
 
-docker-compose -f ./.ci/test-cluster.yml up -d
+docker compose -f ./.ci/test-cluster.yml up -d
 
 # don't wait on 7512: nginx will accept connections far before Kuzzle does
 KUZZLE_PORT=17510 ./bin/wait-kuzzle

.ci/scripts/run-test.sh

@@ -11,7 +11,7 @@ fi
 echo "Testing Kuzzle against node v$NODE_VERSION"
 n $NODE_VERSION
 
-npm install --silent --unsafe-perm
+npm ci --silent --unsafe-perm
 
 npm run build
 

.ci/test-cluster.yml

@@ -31,14 +31,6 @@ x-kuzzle-config: &kuzzle-config
  - NODE_VERSION=${NODE_VERSION:-}
  - DEBUG=none
  - SECRETS_FILE_PREFIX=/var/app/
- # Travis env var must be propagated into the container
- - TRAVIS
- - TRAVIS_COMMIT
- - TRAVIS_JOB_NUMBER
- - TRAVIS_BRANCH
- - TRAVIS_JOB_ID
- - TRAVIS_PULL_REQUEST
- - TRAVIS_REPO_SLUG
  # cluster
  - kuzzle_plugins__cluster__privileged=true
  - kuzzle_plugins__cluster__minimumNodes=3

.ci/test.yml

@@ -34,14 +34,6 @@ services:
  - SECRETS_FILE_PREFIX=/var/app/
  - KUZZLE_FUNCTIONAL_TESTS=${KUZZLE_FUNCTIONAL_TESTS:-test:functional}
  - KUZZLE_COMMAND
- # Travis env var must be propagated into the container
- - TRAVIS
- - TRAVIS_COMMIT
- - TRAVIS_JOB_NUMBER
- - TRAVIS_BRANCH
- - TRAVIS_JOB_ID
- - TRAVIS_PULL_REQUEST
- - TRAVIS_REPO_SLUG
 
  redis:
  image: redis:6