File tree Expand file tree Collapse file tree 3 files changed +5
-3
lines changed
Expand file tree Collapse file tree 3 files changed +5
-3
lines changed Original file line number Diff line number Diff line change 3030set -- " ${POSITIONAL[@]} " # restore positional parameters
3131
3232if [ " ${BUILD} " = true ]; then
33- docker compose -f " ${COMPOSE_FILE} " up --abort-on-container-exit --remove-orphans --build
33+ COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose -f " ${COMPOSE_FILE} " up --abort-on-container-exit --remove-orphans --build
3434else
3535 docker compose -f " ${COMPOSE_FILE} " up --abort-on-container-exit --remove-orphans
3636fi
Original file line number Diff line number Diff line change 44
55GIT_SHA=$( git rev-parse HEAD)
66
7- docker compose -f terraform/docker/docker-compose.yml build
7+ COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose -f terraform/docker/docker-compose.yml build
88docker compose -f terraform/docker/docker-compose.yml run --rm terraform " $@ " -var=" git_sha=${GIT_SHA} " -w default # force terraform to always use default branch
Original file line number Diff line number Diff line change @@ -41,14 +41,16 @@ for filename in $MERCANTILE_FILENAME $NUMPY_FILENAME $PILLOW_FILENAME $RASTERIO_
4141done
4242
4343if [ " ${BUILD} " = true ]; then
44- docker compose -f docker-compose.test.yml --project-name gfw-tile-cache_test build app
44+ COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose -f docker-compose.test.yml --project-name gfw-tile-cache_test build app
4545fi
4646
4747set +e
4848docker compose -f docker-compose.test.yml --project-name gfw-tile-cache_test run --rm app tests/" $@ " -vv
4949exit_code=$?
5050docker compose -f docker-compose.test.yml --project-name gfw-tile-cache_test down --remove-orphans
51+
5152rm -rf tests/terraform/terraform.tfstate* \
5253 tests/terraform/.terraform.lock.hcl \
5354 tests/terraform/.terraform/modules/modules.json
55+
5456exit $exit_code
You can’t perform that action at this time.
0 commit comments