Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Using docker compose instead of docker-compose in scripts #2497

Merged
merged 8 commits into from
Nov 20, 2023
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 0 additions & 33 deletions .ci/haproxy/haproxy.cfg

This file was deleted.

46 changes: 0 additions & 46 deletions .ci/haproxy/snakeoil.pem

This file was deleted.

1 change: 0 additions & 1 deletion .ci/privatebuild/.gitignore

This file was deleted.

70 changes: 0 additions & 70 deletions .ci/privatebuild/Dockerfile

This file was deleted.

18 changes: 0 additions & 18 deletions .ci/privatebuild/build.sh

This file was deleted.

4 changes: 2 additions & 2 deletions .ci/scripts/install-aarch64-deps.sh
100755 → 100644
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions .ci/scripts/install-armhf-deps.sh
100755 → 100644
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion .ci/scripts/install-plugins.sh
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
10 changes: 5 additions & 5 deletions .ci/scripts/run-monkey-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions .ci/scripts/run-test-cluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci/scripts/run-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
44 changes: 0 additions & 44 deletions .ci/test-aarch64.yml

This file was deleted.

44 changes: 0 additions & 44 deletions .ci/test-armhf.yml

This file was deleted.

8 changes: 0 additions & 8 deletions .ci/test-cluster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 0 additions & 8 deletions .ci/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading