Use docker compose v2 (#605)

* . * echo compose file * v2 compose * remove unrelated changes * . --------- Co-authored-by: Amanda Bozigian <[email protected]>
Netflix · Aug 28, 2024 · a35b2d9 · a35b2d9
1 parent 93b2c57
commit a35b2d9
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -8,9 +8,9 @@
 ## Introduction
 
 Metacat is a unified metadata exploration API service. You can explore Hive, RDS, Teradata, Redshift, S3 and Cassandra.
-Metacat provides you information about what data you have, where it resides and how to process it. Metadata in the end 
-is really data about the data. So the primary purpose of Metacat is to give a place to describe the data so that we 
-could do more useful things with it. 
+Metacat provides you information about what data you have, where it resides and how to process it. Metadata in the end
+is really data about the data. So the primary purpose of Metacat is to give a place to describe the data so that we
+could do more useful things with it.
 
 Metacat focusses on solving these three problems:
 
@@ -39,12 +39,12 @@ cd metacat
 ./gradlew clean build
 ```
 
-Once the build is completed, the metacat WAR file is generated under `metacat-war/build/libs` directory. Metacat needs 
+Once the build is completed, the metacat WAR file is generated under `metacat-war/build/libs` directory. Metacat needs
 two basic configurations:
 
-* `metacat.plugin.config.location`: Path to the directory containing the catalog configuration. Please look at 
+* `metacat.plugin.config.location`: Path to the directory containing the catalog configuration. Please look at
 catalog [samples](https://github.com/Netflix/metacat/tree/master/metacat-functional-tests/metacat-test-cluster/etc-metacat/catalog) used for functional testing.
-* `metacat.usermetadata.config.location`: Path to the configuration file containing the connection properties to store 
+* `metacat.usermetadata.config.location`: Path to the configuration file containing the connection properties to store
 user metadata. Please look at this [sample](https://github.com/Netflix/metacat/blob/master/metacat-functional-tests/metacat-test-cluster/etc-metacat/usermetadata.properties).
 
 ### Running Locally
@@ -59,8 +59,8 @@ Swagger API documentation can be accessed @ [http://localhost:8080/swagger-ui/in
 
 **Pre-requisite: Docker compose is installed**
 
-To start a self contained Metacat environment with some sample catalogs run the command below. 
-This will start a `docker-compose` cluster containing a Metacat container, a Hive Metastore Container, a Cassandra 
+To start a self contained Metacat environment with some sample catalogs run the command below.
+This will start a `docker compose` cluster containing a Metacat container, a Hive Metastore Container, a Cassandra
 container and a PostgreSQL container.
 
 ```

diff --git a/metacat-connector-polaris/src/functionalTest/scripts/start_docker_containers.sh b/metacat-connector-polaris/src/functionalTest/scripts/start_docker_containers.sh
@@ -7,13 +7,13 @@ echo DOCKER env is $(env | grep DOCKER)
 
 COMPOSE_FILE=$1
 
-docker-compose --file ${COMPOSE_FILE} up crdb-barrier
+docker compose --file ${COMPOSE_FILE} up crdb-barrier
 if [ $? -ne 0 ]; then
     echo "Unable to start crdb-barrier container"
     exit 9
 fi
 
-docker-compose --file ${COMPOSE_FILE} up -d crdb
+docker compose --file ${COMPOSE_FILE} up -d crdb
 if [ $? -ne 0 ]; then
     echo "Unable to start crdb container"
     exit 10

diff --git a/metacat-connector-polaris/src/functionalTest/scripts/stop_docker_containers.sh b/metacat-connector-polaris/src/functionalTest/scripts/stop_docker_containers.sh
@@ -4,8 +4,8 @@ set -x
 
 COMPOSE_FILE=$1
 
-docker-compose --file $COMPOSE_FILE down --remove-orphans
+docker compose --file $COMPOSE_FILE down --remove-orphans
 if [ $? -ne 0 ]; then
-    echo "Unable to bring down docker-compose"
+    echo "Unable to bring down docker compose"
     exit 9
 fi
diff --git a/metacat-metadata/src/functionalTest/scripts/start_docker_containers.sh b/metacat-metadata/src/functionalTest/scripts/start_docker_containers.sh
@@ -7,13 +7,13 @@ echo DOCKER env is $(env | grep DOCKER)
 
 COMPOSE_FILE=$1
 
-docker-compose --file ${COMPOSE_FILE} up crdb-barrier
+docker compose --file ${COMPOSE_FILE} up crdb-barrier
 if [ $? -ne 0 ]; then
     echo "Unable to start crdb-barrier container"
     exit 9
 fi
 
-docker-compose --file ${COMPOSE_FILE} up -d crdb
+docker compose --file ${COMPOSE_FILE} up -d crdb
 if [ $? -ne 0 ]; then
     echo "Unable to start crdb container"
     exit 10

diff --git a/metacat-metadata/src/functionalTest/scripts/stop_docker_containers.sh b/metacat-metadata/src/functionalTest/scripts/stop_docker_containers.sh
@@ -4,8 +4,8 @@ set -x
 
 COMPOSE_FILE=$1
 
-docker-compose --file $COMPOSE_FILE down --remove-orphans
+docker compose --file $COMPOSE_FILE down --remove-orphans
 if [ $? -ne 0 ]; then
-    echo "Unable to bring down docker-compose"
+    echo "Unable to bring down docker compose"
     exit 9
 fi
diff --git a/scripts/start_metacat_test_cluster.sh b/scripts/start_metacat_test_cluster.sh
@@ -8,19 +8,19 @@ echo DOCKER env is $(env | grep DOCKER)
 # Usage: ./startCluster.sh docker-compose.yml
 COMPOSE_FILE=$1
 
-docker-compose --file ${COMPOSE_FILE} up storage-barrier #>> build/docker_compose.log 2>&1
+docker compose --file ${COMPOSE_FILE} up storage-barrier #>> build/docker_compose.log 2>&1
 if [ $? -ne 0 ]; then
     echo "Unable to start storage containers"
     exit 9
 fi
 
-docker-compose --file ${COMPOSE_FILE} up service-barrier #>> build/docker_compose.log 2>&1
+docker compose --file ${COMPOSE_FILE} up service-barrier #>> build/docker_compose.log 2>&1
 if [ $? -ne 0 ]; then
     echo "Unable to start service containers"
     exit 10
 fi
 
-docker-compose --file ${COMPOSE_FILE} up metacat-barrier #>> build/docker_compose.log 2>&1
+docker compose --file ${COMPOSE_FILE} up metacat-barrier #>> build/docker_compose.log 2>&1
 if [ $? -ne 0 ]; then
     echo "Unable to start metacat service container"
     exit 11

diff --git a/scripts/stop_metacat_test_cluster.sh b/scripts/stop_metacat_test_cluster.sh
@@ -5,8 +5,8 @@ set -x
 # Usage: ./stopCluster.sh docker-compose.yml
 COMPOSE_FILE=$1
 
-docker-compose --file $COMPOSE_FILE down
+docker compose --file $COMPOSE_FILE down
 if [ $? -ne 0 ]; then
-    echo "Unable to bring down docker-compose"
+    echo "Unable to bring down docker compose"
     exit 9
 fi