From 35d85a55b2dbdbe308d31093ed542afe398ea612 Mon Sep 17 00:00:00 2001 From: Vladyslav Vildanov <117659936+vladvildanov@users.noreply.github.com> Date: Mon, 8 Jan 2024 09:56:03 +0200 Subject: [PATCH] Fixed wrong exitcode for cURL and docker-compose fails (#10) * Fixed wrong exitcode for cURL and docker-compose fails * Added TTY option * Removed TTY option --- .github/workflows/tests.yml | 2 +- create_db.sh | 2 +- docker-compose.yml | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5895976..8834a5a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -41,4 +41,4 @@ jobs: - name: Run PING command run: | - docker-compose exec -T master-node bash -c "/opt/redislabs/bin/redis-cli -p ${{ env.RE_DB_PORT }} ping" \ No newline at end of file + docker exec master bash -c "/opt/redislabs/bin/redis-cli -p ${{ env.RE_DB_PORT }} ping" \ No newline at end of file diff --git a/create_db.sh b/create_db.sh index eb51461..f6c1366 100755 --- a/create_db.sh +++ b/create_db.sh @@ -2,4 +2,4 @@ curl -u $RE_USERNAME:$RE_PASS -H "Content-type: application/json" \ -d '{"name": "db", "port": '$RE_DB_PORT', "memory_size": 1273741824, "replication": false, "eviction_policy": "volatile-lru", "sharding": true, "shards_count": 3, "module_list": [{"module_args": "", "module_name": "ReJSON"},{"module_args": "", "module_name": "search"},{"module_args": "", "module_name": "timeseries"},{"module_args": "", "module_name": "bf"}], "oss_cluster": '$RE_USE_OSS_CLUSTER', "proxy_policy": "all-nodes", "shards_placement": "sparse", "shard_key_regex": [{"regex": ".*\\{(?.*)\\}.*"},{"regex": "(?.*)"}]}' \ - -k -X POST https://localhost:9443/v1/bdbs \ No newline at end of file + -k -X POST -f https://localhost:9443/v1/bdbs \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 0b3b4c7..3bfc411 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,6 +2,7 @@ version: "3.9" services: master-node: image: "${IMAGE}" + container_name: "master" cap_add: - SYS_RESOURCE ports: @@ -25,6 +26,7 @@ services: node-1: image: "${IMAGE}" + container_name: "slave-1" cap_add: - SYS_RESOURCE depends_on: @@ -48,6 +50,7 @@ services: node-2: image: "${IMAGE}" + container_name: "slave-2" cap_add: - SYS_RESOURCE depends_on: