Skip to content

Commit

Permalink
Merge branch 'release/v1.7' into backport/release/v1.7/documentation/…
Browse files Browse the repository at this point in the history
…docs-k8s/fix-broken-links
  • Loading branch information
vankichi authored Sep 12, 2024
2 parents 40fd77e + 9994e2c commit f042347
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions Makefile.d/docker.mk
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ docker/build: \
docker/build/index-save \
docker/build/loadtest \
docker/build/manager-index \
docker/build/operator/helm \
docker/build/helm-operator \
docker/build/readreplica-rotate

.PHONY: docker/name/org
Expand Down Expand Up @@ -255,13 +255,13 @@ docker/build/dev-container:
IMAGE=$(DEV_CONTAINER_IMAGE) \
docker/build/image

.PHONY: docker/name/operator/helm
docker/name/operator/helm:
.PHONY: docker/name/helm-operator
docker/name/helm-operator:
@echo "$(ORG)/$(HELM_OPERATOR_IMAGE)"

.PHONY: docker/build/operator/helm
.PHONY: docker/build/helm-operator
## build helm-operator image
docker/build/operator/helm:
docker/build/helm-operator:
@make DOCKERFILE="$(ROOTDIR)/dockers/operator/helm/Dockerfile" \
IMAGE=$(HELM_OPERATOR_IMAGE) \
EXTRA_ARGS="--build-arg OPERATOR_SDK_VERSION=$(OPERATOR_SDK_VERSION) --build-arg UPX_OPTIONS=$(UPX_OPTIONS) $(EXTRA_ARGS)" \
Expand Down

0 comments on commit f042347

Please sign in to comment.