Skip to content

Commit e4f8728

Browse files
philliprossgy-mate
andauthored
Apply suggestions from code review
Use build command instead of explicit buildx command Co-authored-by: Máté Gyöngyösi <[email protected]>
1 parent c91da6d commit e4f8728

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

Makefile

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,6 @@ IMAGE_NAME ?= postgis
5858
DOCKER=docker
5959
DOCKERHUB_DESC_IMG=peterevans/dockerhub-description:latest
6060

61-
# choice between buildx and build depending on the PLATFORMS variable
62-
ifdef PLATFORMS
63-
BUILD := buildx build --platform $(PLATFORMS)
64-
else
65-
BUILD := build
66-
endif
67-
6861
GIT=git
6962
OFFIMG_LOCAL_CLONE=$(HOME)/official-images
7063
OFFIMG_REPO_URL=https://github.com/docker-library/official-images.git
@@ -83,12 +76,12 @@ update:
8376
define build-version
8477
build-$1:
8578
ifeq ($(do_default),true)
86-
$(DOCKER) $(BUILD) --pull -t $(REPO_NAME)/$(IMAGE_NAME):$(shell echo $1) $1
79+
$(DOCKER) build --pull -t $(REPO_NAME)/$(IMAGE_NAME):$(shell echo $1) $1
8780
$(DOCKER) images $(REPO_NAME)/$(IMAGE_NAME):$(shell echo $1)
8881
endif
8982
ifeq ($(do_alpine),true)
9083
ifneq ("$(wildcard $1/alpine)","")
91-
$(DOCKER) $(BUILD) --pull -t $(REPO_NAME)/$(IMAGE_NAME):$(shell echo $1)-alpine $1/alpine
84+
$(DOCKER) build --pull -t $(REPO_NAME)/$(IMAGE_NAME):$(shell echo $1)-alpine $1/alpine
9285
$(DOCKER) images $(REPO_NAME)/$(IMAGE_NAME):$(shell echo $1)-alpine
9386
endif
9487
endif

0 commit comments

Comments
 (0)