Skip to content

Commit e1ee92e

Browse files
committed
Try specifying to use buildkit, buildx to satisfy Docker
1 parent 204348c commit e1ee92e

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

scripts/develop

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ done
3030
set -- "${POSITIONAL[@]}" # restore positional parameters
3131

3232
if [ "${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
3434
else
3535
docker compose -f "${COMPOSE_FILE}" up --abort-on-container-exit --remove-orphans
3636
fi

scripts/infra

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ set -e
44

55
GIT_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
88
docker compose -f terraform/docker/docker-compose.yml run --rm terraform "$@" -var="git_sha=${GIT_SHA}" -w default # force terraform to always use default branch

scripts/test

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,16 @@ for filename in $MERCANTILE_FILENAME $NUMPY_FILENAME $PILLOW_FILENAME $RASTERIO_
4141
done
4242

4343
if [ "${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
4545
fi
4646

4747
set +e
4848
docker compose -f docker-compose.test.yml --project-name gfw-tile-cache_test run --rm app tests/"$@" -vv
4949
exit_code=$?
5050
docker compose -f docker-compose.test.yml --project-name gfw-tile-cache_test down --remove-orphans
51+
5152
rm -rf tests/terraform/terraform.tfstate* \
5253
tests/terraform/.terraform.lock.hcl \
5354
tests/terraform/.terraform/modules/modules.json
55+
5456
exit $exit_code

0 commit comments

Comments
 (0)