vmware-tanzu
/
velero
mirror of https://github.com/vmware-tanzu/velero.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove container-builder-env section. 

Signed-off-by: Xun Jiang <blackpiglet@gmail.com>
pull/5777/head
Xun Jiang 2023-01-16 15:19:54 +08:00
parent 4a17d7e55a
commit dd64d95ffd
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile
View File

@ -120,7 +120,7 @@ build-%:
all-build: $(addprefix build-, $(CLI_PLATFORMS)) all-build: $(addprefix build-, $(CLI_PLATFORMS))
all-containers: container-builder-env all-containers:
@$(MAKE) --no-print-directory container @$(MAKE) --no-print-directory container
@$(MAKE) --no-print-directory container BIN=velero-restic-restore-helper @$(MAKE) --no-print-directory container BIN=velero-restic-restore-helper
@ -177,20 +177,6 @@ shell: build-dirs build-env
$(BUILDER_IMAGE) \ $(BUILDER_IMAGE) \
/bin/sh $(CMD) /bin/sh $(CMD)
container-builder-env:
ifneq ($(BUILDX_ENABLED), true)
$(error $(BUILDX_ERROR))
endif
@docker buildx build \
--target=builder-env \
--build-arg=GOPROXY=$(GOPROXY) \
--build-arg=PKG=$(PKG) \
--build-arg=VERSION=$(VERSION) \
--build-arg=GIT_SHA=$(GIT_SHA) \
--build-arg=GIT_TREE_STATE=$(GIT_TREE_STATE) \
--build-arg=REGISTRY=$(REGISTRY) \
-f $(VELERO_DOCKERFILE) .
container: container:
ifneq ($(BUILDX_ENABLED), true) ifneq ($(BUILDX_ENABLED), true)
$(error $(BUILDX_ERROR)) $(error $(BUILDX_ERROR))
@ -199,6 +185,7 @@ endif
--output=type=$(BUILDX_OUTPUT_TYPE) \ --output=type=$(BUILDX_OUTPUT_TYPE) \
--platform $(BUILDX_PLATFORMS) \ --platform $(BUILDX_PLATFORMS) \
$(addprefix -t , $(IMAGE_TAGS)) \ $(addprefix -t , $(IMAGE_TAGS)) \
--build-arg=GOPROXY=$(GOPROXY) \
--build-arg=PKG=$(PKG) \ --build-arg=PKG=$(PKG) \
--build-arg=BIN=$(BIN) \ --build-arg=BIN=$(BIN) \
--build-arg=VERSION=$(VERSION) \ --build-arg=VERSION=$(VERSION) \