Skip to content

Commit 2741b1d

Browse files
Remove explicit references to Docker buildx
Buildkit and buildx are used by default by the builder since Docker Engine 23.0, so we don't need to explicitly use the buildx command. Signed-off-by: Rajath Agasthya <[email protected]>
1 parent 6f3d599 commit 2741b1d

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

.github/workflows/ci.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,6 @@ jobs:
195195
fi
196196
echo "PUSH_ON_BUILD=${GENERATE_ARTIFACTS}" >> $GITHUB_ENV
197197
echo "DOCKER_BUILD_PLATFORM_OPTIONS=--platform=linux/arm64" >> $GITHUB_ENV
198-
- name: Set up Docker Buildx
199-
uses: docker/setup-buildx-action@v3
200198
- name: Login to GitHub Container Registry
201199
uses: docker/login-action@v3
202200
with:
@@ -243,8 +241,6 @@ jobs:
243241
fi
244242
echo "PUSH_ON_BUILD=${GENERATE_ARTIFACTS}" >> $GITHUB_ENV
245243
echo "DOCKER_BUILD_PLATFORM_OPTIONS=--platform=linux/amd64" >> $GITHUB_ENV
246-
- name: Set up Docker Buildx
247-
uses: docker/setup-buildx-action@v3
248244
- name: Login to GitHub Container Registry
249245
uses: docker/login-action@v3
250246
with:

Makefile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ BUILD_MULTI_ARCH_IMAGES ?= false
1616
DOCKER ?= docker
1717
GO_CMD ?= go
1818
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
19-
BUILDX =
20-
ifeq ($(BUILD_MULTI_ARCH_IMAGES),true)
21-
BUILDX = buildx
22-
endif
2319

2420
##### Global variables #####
2521
include $(CURDIR)/versions.mk
@@ -284,8 +280,7 @@ ALL_TARGETS := $(PUSH_TARGETS) $(BUILD_TARGETS) $(TEST_TARGETS) docker-image
284280
build-%: DOCKERFILE = $(CURDIR)/docker/Dockerfile
285281

286282
build-image:
287-
DOCKER_BUILDKIT=1 \
288-
$(DOCKER) $(BUILDX) build --pull \
283+
$(DOCKER) build --pull \
289284
$(DOCKER_BUILD_OPTIONS) \
290285
$(DOCKER_BUILD_PLATFORM_OPTIONS) \
291286
--tag $(IMAGE) \

0 commit comments

Comments
 (0)