Skip to content

Commit

Permalink
docker: Switch to using buildx
Browse files Browse the repository at this point in the history
Part of getting ARM and AMD64 images published. I have those
working locally, but wanted to provide piecemeal PRs!
  • Loading branch information
yuvipanda committed Oct 31, 2023
1 parent 478404c commit fdb4d5a
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -71,26 +71,28 @@ clean:

.PHONY: image/build-init
image/build-init:
$(DOCKER) build \
DOCKER_BUILDKIT=1 $(DOCKER) buildx build \
--progress=$(DOCKER_BUILD_PROGRESS) \
-t $(IMAGE_INITCONTAINER_BRANCH) \
-f ./build/Dockerfile.initcontainer \
${IMAGE_BUILD_FLAGS_EXTRA} \
--load \
./build
$(DOCKER) tag "$(IMAGE_INITCONTAINER_BRANCH)" "$(IMAGE_INITCONTAINER_COMMIT)"
$(DOCKER) tag "$(IMAGE_INITCONTAINER_BRANCH)" "$(IMAGE_INITCONTAINER_TAG)"
$(DOCKER) tag "$(IMAGE_INITCONTAINER_BRANCH)" "$(IMAGE_INITCONTAINER_LATEST)"

.PHONY: image/build
image/build:
DOCKER_BUILDKIT=1 $(DOCKER) build \
DOCKER_BUILDKIT=1 $(DOCKER) buildx build \
--build-arg bpftraceversion=$(BPFTRACEVERSION) \
--build-arg GIT_ORG=$(GIT_ORG) \
--progress=$(DOCKER_BUILD_PROGRESS) \
--build-arg BUILDKIT_INLINE_CACHE=1 \
--cache-from "$(IMAGE_TRACERUNNER_BRANCH)" \
-t "$(IMAGE_TRACERUNNER_BRANCH)" \
-f build/Dockerfile.tracerunner \
--load \
${IMAGE_BUILD_FLAGS_EXTRA} \
.
$(DOCKER) tag "$(IMAGE_TRACERUNNER_BRANCH)" "$(IMAGE_TRACERUNNER_COMMIT)"
Expand Down

0 comments on commit fdb4d5a

Please sign in to comment.