build: set --load as BUILD_ARGS default

Otherwise overwriting it with e.g. `--push` is not possible as the combination with `--load` results in an error. Signed-off-by: Hidde Beydals <[email protected]>
fluxcd · Jan 28, 2022 · 0c73fa5 · 0c73fa5
1 parent bfb283c
commit 0c73fa5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -73,7 +73,8 @@ jobs:
           make docker-build IMG=test/helm-controller:latest \
             BUILD_PLATFORMS=linux/amd64 \
             BUILD_ARGS="--cache-from=type=local,src=/tmp/.buildx-cache \
-              --cache-to=type=local,dest=/tmp/.buildx-cache-new,mode=max"
+              --cache-to=type=local,dest=/tmp/.buildx-cache-new,mode=max \
+              --load"
       - # Temp fix
         # https://github.com/docker/build-push-action/issues/252
         # https://github.com/moby/buildkit/issues/1896

diff --git a/Makefile b/Makefile
@@ -11,7 +11,7 @@ GOBIN=$(shell go env GOBIN)
 endif
 
 # Allows for defining additional Docker buildx arguments, e.g. '--push'.
-BUILD_ARGS ?=
+BUILD_ARGS ?= --load
 # Architectures to build images for.
 BUILD_PLATFORMS ?= linux/amd64
 
@@ -94,7 +94,6 @@ docker-build:
 	docker buildx build \
 	--platform=$(BUILD_PLATFORMS) \
 	-t ${IMG} \
-	--load \
 	${BUILD_ARGS} .
 
 # Push the docker image