|
2 | 2 | # SPDX-License-Identifier: Apache-2.0
|
3 | 3 |
|
4 | 4 | # Image URL to use all building/pushing image targets
|
5 |
| -CTR_IMG ?= gmcmanager:latest |
6 |
| -ROUTER_IMG ?= gmcrouter:latest |
| 5 | +CTR_IMG ?= gmcmanager |
| 6 | +ROUTER_IMG ?= gmcrouter |
| 7 | +VERSION ?= latest |
| 8 | +DOCKER_REGISTRY ?= docker.io/opea |
7 | 9 | # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
|
8 | 10 | ENVTEST_K8S_VERSION = 1.29.0
|
9 | 11 |
|
@@ -111,18 +113,26 @@ run-router: manifests generate fmt vet
|
111 | 113 |
|
112 | 114 |
|
113 | 115 | ## Build manager and router Docker images
|
114 |
| -.PHONY: docker |
115 |
| -docker: manager-image router-image |
| 116 | +.PHONY: docker.build |
| 117 | +docker.build: manager-image router-image |
116 | 118 |
|
117 | 119 | # Build manager Docker image
|
118 | 120 | manager-image:
|
119 | 121 | @echo "Building manager Docker image..."
|
120 |
| - $(CONTAINER_TOOL) build -t ${CTR_IMG} --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile.manager . |
| 122 | + $(CONTAINER_TOOL) build -t $(DOCKER_REGISTRY)/${CTR_IMG}:$(VERSION) -f Dockerfile.manager . |
121 | 123 |
|
122 | 124 | # Build router Docker image
|
123 | 125 | router-image:
|
124 | 126 | @echo "Building router Docker image..."
|
125 |
| - $(CONTAINER_TOOL) build -t ${ROUTER_IMG} --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile.router . |
| 127 | + $(CONTAINER_TOOL) build -t $(DOCKER_REGISTRY)/${ROUTER_IMG}:$(VERSION) -f Dockerfile.router . |
| 128 | + |
| 129 | +# Publish manager and router docker images |
| 130 | +.PHONY: docker.push |
| 131 | +docker.push: |
| 132 | + @echo "Push manager Docker image..." |
| 133 | + $(CONTAINER_TOOL) push $(DOCKER_REGISTRY)/${CTR_IMG}:$(VERSION) |
| 134 | + @echo "Push router Docker image..." |
| 135 | + $(CONTAINER_TOOL) push $(DOCKER_REGISTRY)/${ROUTER_IMG}:$(VERSION) |
126 | 136 |
|
127 | 137 |
|
128 | 138 | ## Clean up build binaries
|
|
0 commit comments