Try to use buildkit everywhere

Author: dmannarino

scripts/delete_workspace

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+export COMPOSE_DOCKER_CLI_BUILD="1" DOCKER_BUILDKIT="1"
+
 set -e
 
 docker compose -f terraform/docker/docker-compose.yml build

scripts/develop

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+export COMPOSE_DOCKER_CLI_BUILD="1" DOCKER_BUILDKIT="1"
+
 set -e
 
 # Default values
@@ -30,7 +32,7 @@ done
 set -- "${POSITIONAL[@]}" # restore positional parameters
 
 if [ "${BUILD}" = true ]; then
-  COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose -f "${COMPOSE_FILE}" up --abort-on-container-exit --remove-orphans --build
+  docker compose -f "${COMPOSE_FILE}" up --abort-on-container-exit --remove-orphans --build
 else
   docker compose -f "${COMPOSE_FILE}" up --abort-on-container-exit --remove-orphans
 fi

scripts/infra

@@ -1,8 +1,10 @@
 #!/bin/bash
 
+export COMPOSE_DOCKER_CLI_BUILD="1" DOCKER_BUILDKIT="1"
+
 set -e
 
 GIT_SHA=$(git rev-parse HEAD)
 
-COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose -f terraform/docker/docker-compose.yml build
+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}" -w default  # force terraform to always use default branch

scripts/terraform

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+export COMPOSE_DOCKER_CLI_BUILD="1" DOCKER_BUILDKIT="1"
+
 set -e
 
 docker compose -f terraform/docker/docker-compose.yml run --rm --entrypoint terraform --workdir /usr/local/src/terraform terraform "$@"

scripts/test

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+export COMPOSE_DOCKER_CLI_BUILD="1" DOCKER_BUILDKIT="1"
+
 set -e
 
 PYTHON_RUNTIME="python3.10"
@@ -41,7 +43,7 @@ for filename in $MERCANTILE_FILENAME $NUMPY_FILENAME $PILLOW_FILENAME $RASTERIO_
 done
 
 if [ "${BUILD}" = true ]; then
-  COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose -f docker-compose.test.yml --project-name gfw-tile-cache_test build app
+  docker compose -f docker-compose.test.yml --project-name gfw-tile-cache_test build app
 fi
 
 set +e