Revert scripts

wri · Jul 31, 2024 · 71dc93b · 71dc93b
1 parent 3d0498d
commit 71dc93b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/scripts/infra b/scripts/infra
@@ -4,5 +4,5 @@ set -e
 
 GIT_SHA=$(git rev-parse HEAD)
 
-docker compose -f terraform/docker/docker-compose.yml build
-docker compose -f terraform/docker/docker-compose.yml run --rm terraform "$@" -var="git_sha=${GIT_SHA}"
+docker-compose -f terraform/docker/docker-compose.yml build
+docker-compose -f terraform/docker/docker-compose.yml run --rm terraform "$@" -var="git_sha=${GIT_SHA}"
diff --git a/scripts/test b/scripts/test
@@ -61,16 +61,16 @@ fi
 
 if [ "${BUILD}" = true ]; then
   docker build -t batch_gdal-python_test . -f batch/gdal-python.dockerfile
-  #docker build -t batch_postgresql-client_test . -f batch/postgresql-client.dockerfile
-  #docker build -t batch_tile_cache_test . -f batch/tile_cache.dockerfile
-  #docker build -t pixetl_test . -f batch/pixetl.dockerfile
-  docker compose -f docker-compose.test.yml --project-name gfw-data-api_test build --no-cache app_test
+  docker build -t batch_postgresql-client_test . -f batch/postgresql-client.dockerfile
+  docker build -t batch_tile_cache_test . -f batch/tile_cache.dockerfile
+  docker build -t pixetl_test . -f batch/pixetl.dockerfile
+  docker-compose -f docker-compose.test.yml --project-name gfw-data-api_test build --no-cache app_test
 fi
 
 set +e
 
 # Everything from "--cov-report on" become the arguments to the pytest run inside the docker.
-docker compose -f docker-compose.test.yml --project-name gfw-data-api_test run --rm --name app_test app_test --cov-report xml:/app/tests/cobertura.xml $HANGING $SLOW  $DO_COV $DISABLE_WARNINGS $SHOW_STDOUT $args
+docker-compose -f docker-compose.test.yml --project-name gfw-data-api_test run --rm --name app_test app_test --cov-report xml:/app/tests/cobertura.xml $HANGING $SLOW  $DO_COV $DISABLE_WARNINGS $SHOW_STDOUT $args
 exit_code=$?
-docker compose -f docker-compose.test.yml --project-name gfw-data-api_test down --remove-orphans
+docker-compose -f docker-compose.test.yml --project-name gfw-data-api_test down --remove-orphans
 exit $exit_code
diff --git a/scripts/test_v2 b/scripts/test_v2
@@ -62,7 +62,7 @@ fi
 set +e
 
 # Everything from "--cov-report on" become the arguments to the pytest run inside the docker.
-docker compose -f docker-compose.test.yml --project-name gfw-data-api_test run --rm --name app_test app_test --cov-report xml:/app/tests_v2/cobertura.xml $DO_COV $DISABLE_WARNINGS $SHOW_STDOUT $args
+docker-compose -f docker-compose.test.yml --project-name gfw-data-api_test run --rm --name app_test app_test --cov-report xml:/app/tests_v2/cobertura.xml $DO_COV $DISABLE_WARNINGS $SHOW_STDOUT $args
 exit_code=$?
-docker compose -f docker-compose.test.yml --project-name gfw-data-api_test down --remove-orphans
+docker-compose -f docker-compose.test.yml --project-name gfw-data-api_test down --remove-orphans
 exit $exit_code