fix: move --log-level option to docker command

elastic · Aug 5, 2024 · f3940e1 · f3940e1
1 parent 8f44f8e
commit f3940e1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.ci/scripts/pull_and_build.sh b/.ci/scripts/pull_and_build.sh
@@ -3,14 +3,14 @@ export NODEJS_VERSION=$(cat .nvmrc)
 export STACK_VERSION=${STACK_VERSION:-8.6.1}
 
 STACK_VERSION=${STACK_VERSION} \
-docker compose -f ./dev-utils/docker-compose.yml --log-level INFO pull --quiet --ignore-pull-failures
+docker --log-level INFO compose -f ./dev-utils/docker-compose.yml pull --quiet --ignore-pull-failures
 
 # We are building the images here even though the Docker images are already cached in Packer.
 # This is because there could be changes in the PR affecting the files copied to the Docker image,
 # which we want to test in the current build.
 NODEJS_VERSION="${NODEJS_VERSION}" \
 STACK_VERSION=${STACK_VERSION} \
-docker compose -f ./dev-utils/docker-compose.yml --log-level INFO build >docker-compose.log 2>docker-compose.err
+docker --log-level INFO compose -f ./dev-utils/docker-compose.yml build >docker-compose.log 2>docker-compose.err
 if [ $? -gt 0 ] ; then
   echo "Docker compose failed, see the below log output"
   cat docker-compose.log && rm docker-compose.log

diff --git a/.ci/scripts/test.sh b/.ci/scripts/test.sh
@@ -28,9 +28,8 @@ do
   APM_SERVER_PORT=${APM_SERVER_PORT} \
   APM_SERVER_URL=${APM_SERVER_URL} \
   KIBANA_URL=${KIBANA_URL} \
-  docker compose \
+  docker --log-level INFO compose \
     -f ./dev-utils/docker-compose.yml \
-    --log-level INFO \
     up \
     --quiet-pull \
     --exit-code-from node-puppeteer \