Uptake latest grpc-js

Author: rlubke

bin/docker-utils.sh

@@ -16,7 +16,7 @@ echo ${TYPE}
 
 function coh_up() {
   echo "Starting test containers ..."
-  DOCKER_REGISTRY="${REGISTRY}" COHERENCE_VERSION="${VERSION}" COHERENCE_TYPE="${TYPE}" docker-compose -f etc/docker-compose-2-members.yaml up --force-recreate --renew-anon-volumes -d
+  DOCKER_REGISTRY="${REGISTRY}" COHERENCE_VERSION="${VERSION}" COHERENCE_TYPE="${TYPE}" docker compose -f etc/docker-compose-2-members.yaml up --force-recreate --renew-anon-volumes -d
   SECONDS=0
   echo "Waiting for Coherence to be healthy (within 60s) ..."
   while [ ${SECONDS} -le 60 ]; do
@@ -29,14 +29,14 @@ function coh_up() {
   done
   node_version=$(node -v)
   filename="logs-startup-${VERSION}-${node_version}.txt"
-  DOCKER_REGISTRY="${REGISTRY}" COHERENCE_VERSION="${VERSION}" COHERENCE_TYPE="${TYPE}" docker-compose -f etc/docker-compose-2-members.yaml logs --no-color > "${filename}"
+  DOCKER_REGISTRY="${REGISTRY}" COHERENCE_VERSION="${VERSION}" COHERENCE_TYPE="${TYPE}" docker compose -f etc/docker-compose-2-members.yaml logs --no-color > "${filename}"
   echo "Coherence failed to become healthy.  See ${filename} for details."
   coh_down
   exit 1
 }
 
 function coh_down() {
-  DOCKER_REGISTRY="${REGISTRY}" COHERENCE_VERSION="${VERSION}" COHERENCE_TYPE="${TYPE}" docker-compose -f etc/docker-compose-2-members.yaml down -v
+  DOCKER_REGISTRY="${REGISTRY}" COHERENCE_VERSION="${VERSION}" COHERENCE_TYPE="${TYPE}" docker compose -f etc/docker-compose-2-members.yaml down -v
 }
 
 while getopts "ud" OPTION; do

bin/test-cycle.sh

@@ -42,7 +42,7 @@ function run_tests() {
 
 function dump_logs() {
   node_version=$(node -v)
-  DOCKER_REGISTRY="${REGISTRY}" COHERENCE_VERSION="${VERSION}" COHERENCE_TYPE="${TYPE}" docker-compose -f etc/docker-compose-2-members.yaml logs --no-color > logs-"${1}"-test-"${VERSION}"-"${node_version}".txt
+  DOCKER_REGISTRY="${REGISTRY}" COHERENCE_VERSION="${VERSION}" COHERENCE_TYPE="${TYPE}" docker compose -f etc/docker-compose-2-members.yaml logs --no-color > logs-"${1}"-test-"${VERSION}"-"${node_version}".txt
 }
 
 function cleanup() {