@@ -181,7 +181,7 @@ GIT_COMMIT := $(shell git rev-parse --short HEAD)
181181deploy-kind : manifests deploy-namespace-rbac # # Load operator image and deploy operator into current KinD cluster
182182 @$(call check_defined, OPERATOR_IMAGE, path to the Operator image within the registry e.g. rabbitmq/cluster-operator)
183183 @$(call check_defined, DOCKER_REGISTRY_SERVER, URL of docker registry containing the Operator image e.g. registry.my-company.com)
184- docker buildx build --build-arg=GIT_COMMIT=$(GIT_COMMIT ) -t $(DOCKER_REGISTRY_SERVER ) /$(OPERATOR_IMAGE ) :$(GIT_COMMIT ) .
184+ docker buildx build --build-arg=DOCKER_REGISTRY= $( DOCKER_REGISTRY_SERVER ) --build-arg= GIT_COMMIT=$(GIT_COMMIT ) -t $(DOCKER_REGISTRY_SERVER ) /$(OPERATOR_IMAGE ) :$(GIT_COMMIT ) .
185185 kind load docker-image $(DOCKER_REGISTRY_SERVER ) /$(OPERATOR_IMAGE ) :$(GIT_COMMIT )
186186 kustomize build config/crd | kubectl apply -f -
187187 kustomize build config/default/overlays/kind | sed ' s@((operator_docker_image))@"$(DOCKER_REGISTRY_SERVER)/$(OPERATOR_IMAGE):$(GIT_COMMIT)"@' | kubectl apply -f -
@@ -205,7 +205,7 @@ generate-installation-manifest: | $(YTT)
205205docker-build : # # Build the docker image with tag `latest`
206206 @$(call check_defined, OPERATOR_IMAGE, path to the Operator image within the registry e.g. rabbitmq/cluster-operator)
207207 @$(call check_defined, DOCKER_REGISTRY_SERVER, URL of docker registry containing the Operator image e.g. registry.my-company.com)
208- docker buildx build --build-arg=GIT_COMMIT=$(GIT_COMMIT ) -t $(DOCKER_REGISTRY_SERVER ) /$(OPERATOR_IMAGE ) :latest .
208+ docker buildx build --build-arg=DOCKER_REGISTRY= $( DOCKER_REGISTRY_SERVER ) --build-arg= GIT_COMMIT=$(GIT_COMMIT ) -t $(DOCKER_REGISTRY_SERVER ) /$(OPERATOR_IMAGE ) :latest .
209209
210210docker-push : # # Push the docker image with tag `latest`
211211 @$(call check_defined, OPERATOR_IMAGE, path to the Operator image within the registry e.g. rabbitmq/cluster-operator)
@@ -215,7 +215,7 @@ docker-push: ## Push the docker image with tag `latest`
215215docker-build-dev :
216216 @$(call check_defined, OPERATOR_IMAGE, path to the Operator image within the registry e.g. rabbitmq/cluster-operator)
217217 @$(call check_defined, DOCKER_REGISTRY_SERVER, URL of docker registry containing the Operator image e.g. registry.my-company.com)
218- docker buildx build --build-arg=GIT_COMMIT=$(GIT_COMMIT ) -t $(DOCKER_REGISTRY_SERVER ) /$(OPERATOR_IMAGE ) :$(GIT_COMMIT ) .
218+ docker buildx build --build-arg=DOCKER_REGISTRY= $( DOCKER_REGISTRY_SERVER ) --build-arg= GIT_COMMIT=$(GIT_COMMIT ) -t $(DOCKER_REGISTRY_SERVER ) /$(OPERATOR_IMAGE ) :$(GIT_COMMIT ) .
219219 docker push $(DOCKER_REGISTRY_SERVER ) /$(OPERATOR_IMAGE ) :$(GIT_COMMIT )
220220
221221# https://github.com/cert-manager/cmctl/releases
0 commit comments