Merge pull request #1336 from guardian/aa/docker-compose

fix: Update docker syntax
guardian · Nov 28, 2024 · 00fff31 · 00fff31
2 parents 35a9237 + 5291aab
commit 00fff31
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/packages/dev-environment/script/start b/packages/dev-environment/script/start
@@ -52,16 +52,15 @@ start_containers() {
   open -a Docker
   set -e
 
-while (! docker stats --no-stream ); do
-  # Docker takes a few seconds to initialize
-  sleep 5
-  echo -e "${yellow}Do you have an alternative Docker install, such as podman or minikube, aliased to 'docker'? If so, please launch it now${clear}"
-  echo "Standing by for Docker to start..."
-  echo ""
-done
-
-docker-compose -f "${DIR}/../docker-compose.yaml" --env-file "$MAIN_ENV_FILE" --env-file "$LOCAL_ENV_FILE" up -d --build
-
+  while (! docker stats --no-stream ); do
+    # Docker takes a few seconds to initialize
+    sleep 5
+    echo -e "${yellow}Do you have an alternative Docker install, such as podman or minikube, aliased to 'docker'? If so, please launch it now${clear}"
+    echo "Standing by for Docker to start..."
+    echo ""
+  done
+
+  docker compose -f "${DIR}/../docker-compose.yaml" --env-file "$MAIN_ENV_FILE" --env-file "$LOCAL_ENV_FILE" up -d --build
 }
 
 check_vpn_connection() {

diff --git a/packages/dev-environment/script/start-prisma-migrate-test b/packages/dev-environment/script/start-prisma-migrate-test
@@ -34,7 +34,7 @@ start_containers() {
   step "Launching Docker containers"
 
   if (docker info) 2>&1 >/dev/null; then
-    docker-compose -f "${DIR}/../docker-compose-prisma-migrate.yaml" --env-file "$MAIN_ENV_FILE" --env-file "$LOCAL_ENV_FILE" up -d --build
+    docker compose -f "${DIR}/../docker-compose-prisma-migrate.yaml" --env-file "$MAIN_ENV_FILE" --env-file "$LOCAL_ENV_FILE" up -d --build
   else
     echo "Docker is not running. Please start Docker."
     exit 1