updated makefile anddockerfile based on pr comments

ruokun-niu · Jan 21, 2025 · 47f5421 · 47f5421
1 parent 81eee07
commit 47f5421
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 15 deletions.
diff --git a/control-planes/kubernetes_provider/Dockerfile b/control-planes/kubernetes_provider/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG RELEASE=1
+ARG RELEASE=0
 FROM rust@sha256:8fae3b1a63a4dcfb6cf277a49fb5967ccbf479b9e9cee4588a077a9cb216e6d4 as builder 
 ARG RELEASE
 # rust:1.81-bullseye

diff --git a/control-planes/kubernetes_provider/Makefile b/control-planes/kubernetes_provider/Makefile
@@ -9,7 +9,7 @@ RELEASE ?= 0  # if set to 1, it will use the `release` cargo profile (LTO set to
 default: docker-build
 
 docker-build:
-	docker buildx build .. --build-arg RELEASE=$(RELEASE) -f ./Dockerfile  -t $(IMAGE_PREFIX)/kubernetes-provider:$(DOCKER_TAG_VERSION) $(DOCKERX_OPTS)
+	docker buildx build .. -f ./Dockerfile  -t $(IMAGE_PREFIX)/kubernetes-provider:$(DOCKER_TAG_VERSION) $(DOCKERX_OPTS)
 
 kind-load:
 	kind load docker-image $(IMAGE_PREFIX)/kubernetes-provider:$(DOCKER_TAG_VERSION) --name $(CLUSTER_NAME)

diff --git a/control-planes/mgmt_api/Dockerfile b/control-planes/mgmt_api/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG RELEASE=1
+ARG RELEASE=0
 FROM rust@sha256:8fae3b1a63a4dcfb6cf277a49fb5967ccbf479b9e9cee4588a077a9cb216e6d4 as builder
 ARG RELEASE
 # rust:1.81-bullseye

diff --git a/control-planes/mgmt_api/Makefile b/control-planes/mgmt_api/Makefile
@@ -9,7 +9,7 @@ RELEASE ?= 0  # if set to 1, it will use the `release` cargo profile (LTO set to
 default: docker-build
 
 docker-build:
-	docker buildx build ../../ --build-arg RELEASE=$(RELEASE) -f ./Dockerfile -t $(IMAGE_PREFIX)/api:$(DOCKER_TAG_VERSION) $(DOCKERX_OPTS)
+	docker buildx build ../../ -f ./Dockerfile -t $(IMAGE_PREFIX)/api:$(DOCKER_TAG_VERSION) $(DOCKERX_OPTS)
 
 kind-load:
 	kind load docker-image $(IMAGE_PREFIX)/api:$(DOCKER_TAG_VERSION) --name $(CLUSTER_NAME)

diff --git a/query-container/publish-api/Dockerfile b/query-container/publish-api/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG RELEASE=1
+ARG RELEASE=0
 FROM rust@sha256:fd45a543ed41160eae2ce9e749e5b3c972625b0778104e8962e9bfb113535301 as builder
 ARG RELEASE
 # rust:1.74

diff --git a/query-container/publish-api/Makefile b/query-container/publish-api/Makefile
@@ -9,7 +9,7 @@ RELEASE ?= 0  # if set to 1, it will use the `release` cargo profile (LTO set to
 default: docker-build
 
 docker-build:
-	docker buildx build . --build-arg RELEASE=$(RELEASE) -t $(IMAGE_PREFIX)/query-container-publish-api:$(DOCKER_TAG_VERSION) $(DOCKERX_OPTS)
+	docker buildx build .  -t $(IMAGE_PREFIX)/query-container-publish-api:$(DOCKER_TAG_VERSION) $(DOCKERX_OPTS)
 
 kind-load:
 	kind load docker-image $(IMAGE_PREFIX)/query-container-publish-api:$(DOCKER_TAG_VERSION) --name $(CLUSTER_NAME)

diff --git a/query-container/query-host/Dockerfile b/query-container/query-host/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG RELEASE=1
+ARG RELEASE=0
 FROM rust@sha256:8fae3b1a63a4dcfb6cf277a49fb5967ccbf479b9e9cee4588a077a9cb216e6d4 as builder
 ARG RELEASE
 # rust:1.81-bullseye

diff --git a/query-container/query-host/Makefile b/query-container/query-host/Makefile
@@ -9,7 +9,7 @@ RELEASE ?= 0  # if set to 1, it will use the `release` cargo profile (LTO set to
 default: docker-build
 
 docker-build:
-	docker buildx build . --build-arg RELEASE=$(RELEASE) -t $(IMAGE_PREFIX)/query-container-query-host:$(DOCKER_TAG_VERSION) $(DOCKERX_OPTS)
+	docker buildx build . -t $(IMAGE_PREFIX)/query-container-query-host:$(DOCKER_TAG_VERSION) $(DOCKERX_OPTS)
 
 kind-load:
 	kind load docker-image $(IMAGE_PREFIX)/query-container-query-host:$(DOCKER_TAG_VERSION) --name $(CLUSTER_NAME)

diff --git a/query-container/view-svc/Dockerfile b/query-container/view-svc/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG RELEASE=1
+ARG RELEASE=0
 FROM rust@sha256:8fae3b1a63a4dcfb6cf277a49fb5967ccbf479b9e9cee4588a077a9cb216e6d4 as builder
 ARG RELEASE
 # rust:1.81-bullseye

diff --git a/sources/shared/change-dispatcher/Dockerfile b/sources/shared/change-dispatcher/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG RELEASE=1
+ARG RELEASE=0
 FROM rust@sha256:fd45a543ed41160eae2ce9e749e5b3c972625b0778104e8962e9bfb113535301 as builder
 ARG RELEASE
 # rust:1.74

diff --git a/sources/shared/change-dispatcher/Makefile b/sources/shared/change-dispatcher/Makefile
@@ -9,7 +9,7 @@ RELEASE ?= 0  # if set to 1, it will use the `release` cargo profile (LTO set to
 default: docker-build
 
 docker-build:
-	docker buildx build ../../.. --build-arg RELEASE=$(RELEASE) -f ./Dockerfile -t $(IMAGE_PREFIX)/source-change-dispatcher:$(DOCKER_TAG_VERSION) $(DOCKERX_OPTS)
+	docker buildx build ../../.. -f ./Dockerfile -t $(IMAGE_PREFIX)/source-change-dispatcher:$(DOCKER_TAG_VERSION) $(DOCKERX_OPTS)
 
 kind-load:
 	kind load docker-image $(IMAGE_PREFIX)/source-change-dispatcher:$(DOCKER_TAG_VERSION) --name $(CLUSTER_NAME)

diff --git a/sources/shared/change-router/Dockerfile b/sources/shared/change-router/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG RELEASE=1
+ARG RELEASE=0
 FROM rust@sha256:8fae3b1a63a4dcfb6cf277a49fb5967ccbf479b9e9cee4588a077a9cb216e6d4 as builder
 ARG RELEASE
 # rust:1.81-bullseye

diff --git a/sources/shared/change-router/Makefile b/sources/shared/change-router/Makefile
@@ -9,7 +9,7 @@ RELEASE ?= 0  # if set to 1, it will use the `release` cargo profile (LTO set to
 default: docker-build
 
 docker-build:
-	docker buildx build ../../.. --build-arg RELEASE=$(RELEASE) -f ./Dockerfile -t $(IMAGE_PREFIX)/source-change-router:$(DOCKER_TAG_VERSION) $(DOCKERX_OPTS)
+	docker buildx build ../../.. -f ./Dockerfile -t $(IMAGE_PREFIX)/source-change-router:$(DOCKER_TAG_VERSION) $(DOCKERX_OPTS)
 
 kind-load:
 	kind load docker-image $(IMAGE_PREFIX)/source-change-router:$(DOCKER_TAG_VERSION) --name $(CLUSTER_NAME)

diff --git a/sources/shared/query-api/Dockerfile b/sources/shared/query-api/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG RELEASE=1
+ARG RELEASE=0
 FROM rust@sha256:fd45a543ed41160eae2ce9e749e5b3c972625b0778104e8962e9bfb113535301 as builder
 ARG RELEASE
 # rust:1.74

diff --git a/sources/shared/query-api/Makefile b/sources/shared/query-api/Makefile
@@ -9,7 +9,7 @@ RELEASE ?= 0  # if set to 1, it will use the `release` cargo profile (LTO set to
 default: docker-build
 
 docker-build:
-	docker buildx build ../../.. --build-arg RELEASE=$(RELEASE) -f ./Dockerfile -t $(IMAGE_PREFIX)/source-query-api:$(DOCKER_TAG_VERSION) $(DOCKERX_OPTS)
+	docker buildx build ../../.. -f ./Dockerfile -t $(IMAGE_PREFIX)/source-query-api:$(DOCKER_TAG_VERSION) $(DOCKERX_OPTS)
 
 kind-load:
 	kind load docker-image $(IMAGE_PREFIX)/source-query-api:$(DOCKER_TAG_VERSION) --name $(CLUSTER_NAME)