From 6463143e820d34c0ba77cb3ca9913d5b2c9de6a8 Mon Sep 17 00:00:00 2001 From: Kiichiro YUKAWA Date: Fri, 25 Oct 2024 13:29:51 +0900 Subject: [PATCH 1/2] Fix bind DOCKER_OPTS option (#2718) * :bug: Fix bind DOCKER_OPTS option Signed-off-by: vankichi * Fix --------- Signed-off-by: vankichi --- Makefile.d/docker.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.d/docker.mk b/Makefile.d/docker.mk index 3e0f7563fe..7a09d688e3 100644 --- a/Makefile.d/docker.mk +++ b/Makefile.d/docker.mk @@ -304,7 +304,7 @@ docker/name/loadtest: ## build loadtest image docker/build/loadtest: @make DOCKERFILE="$(ROOTDIR)/dockers/tools/cli/loadtest/Dockerfile" \ - DOCKER_OPTS="--build-arg ZLIB_VERSION=$(ZLIB_VERSION) --build-arg HDF5_VERSION=$(HDF5_VERSION)" \ + DOCKER_OPTS="$${DOCKER_OPTS:+$${DOCKER_OPTS}} --build-arg ZLIB_VERSION=$(ZLIB_VERSION) --build-arg HDF4_VERSION=$(HDF5_VERSION)" \ IMAGE=$(LOADTEST_IMAGE) \ docker/build/image @@ -372,7 +372,7 @@ docker/name/benchmark-job: docker/build/benchmark-job: @make DOCKERFILE="$(ROOTDIR)/dockers/tools/benchmark/job/Dockerfile" \ IMAGE=$(BENCHMARK_JOB_IMAGE) \ - DOCKER_OPTS="--build-arg ZLIB_VERSION=$(ZLIB_VERSION) --build-arg HDF5_VERSION=$(HDF5_VERSION)" \ + DOCKER_OPTS="$${DOCKER_OPTS:+$${DOCKER_OPTS}} --build-arg ZLIB_VERSION=$(ZLIB_VERSION) --build-arg HDF4_VERSION=$(HDF5_VERSION)" \ docker/build/image .PHONY: docker/name/benchmark-operator @@ -395,5 +395,5 @@ docker/name/example-client: docker/build/example-client: @make DOCKERFILE="$(ROOTDIR)/dockers/example/client/Dockerfile" \ IMAGE=$(EXAMPLE_CLIENT_IMAGE) \ - DOCKER_OPTS="--build-arg ZLIB_VERSION=$(ZLIB_VERSION) --build-arg HDF5_VERSION=$(HDF5_VERSION)" \ + DOCKER_OPTS="$${DOCKER_OPTS:+$${DOCKER_OPTS}} --build-arg ZLIB_VERSION=$(ZLIB_VERSION) --build-arg HDF4_VERSION=$(HDF5_VERSION)" \ docker/build/image From 320efb49f677564bf4010d2fc945c88a9e272a7e Mon Sep 17 00:00:00 2001 From: Kiichiro YUKAWA Date: Fri, 25 Oct 2024 14:45:26 +0900 Subject: [PATCH 2/2] Apply suggestions from code review Signed-off-by: Kiichiro YUKAWA --- Makefile.d/docker.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.d/docker.mk b/Makefile.d/docker.mk index 7a09d688e3..d23324f4fb 100644 --- a/Makefile.d/docker.mk +++ b/Makefile.d/docker.mk @@ -304,7 +304,7 @@ docker/name/loadtest: ## build loadtest image docker/build/loadtest: @make DOCKERFILE="$(ROOTDIR)/dockers/tools/cli/loadtest/Dockerfile" \ - DOCKER_OPTS="$${DOCKER_OPTS:+$${DOCKER_OPTS}} --build-arg ZLIB_VERSION=$(ZLIB_VERSION) --build-arg HDF4_VERSION=$(HDF5_VERSION)" \ + DOCKER_OPTS="$${DOCKER_OPTS:+$${DOCKER_OPTS}} --build-arg ZLIB_VERSION=$(ZLIB_VERSION) --build-arg HDF5_VERSION=$(HDF5_VERSION)" \ IMAGE=$(LOADTEST_IMAGE) \ docker/build/image @@ -372,7 +372,7 @@ docker/name/benchmark-job: docker/build/benchmark-job: @make DOCKERFILE="$(ROOTDIR)/dockers/tools/benchmark/job/Dockerfile" \ IMAGE=$(BENCHMARK_JOB_IMAGE) \ - DOCKER_OPTS="$${DOCKER_OPTS:+$${DOCKER_OPTS}} --build-arg ZLIB_VERSION=$(ZLIB_VERSION) --build-arg HDF4_VERSION=$(HDF5_VERSION)" \ + DOCKER_OPTS="$${DOCKER_OPTS:+$${DOCKER_OPTS}} --build-arg ZLIB_VERSION=$(ZLIB_VERSION) --build-arg HDF5_VERSION=$(HDF5_VERSION)" \ docker/build/image .PHONY: docker/name/benchmark-operator @@ -395,5 +395,5 @@ docker/name/example-client: docker/build/example-client: @make DOCKERFILE="$(ROOTDIR)/dockers/example/client/Dockerfile" \ IMAGE=$(EXAMPLE_CLIENT_IMAGE) \ - DOCKER_OPTS="$${DOCKER_OPTS:+$${DOCKER_OPTS}} --build-arg ZLIB_VERSION=$(ZLIB_VERSION) --build-arg HDF4_VERSION=$(HDF5_VERSION)" \ + DOCKER_OPTS="$${DOCKER_OPTS:+$${DOCKER_OPTS}} --build-arg ZLIB_VERSION=$(ZLIB_VERSION) --build-arg HDF5_VERSION=$(HDF5_VERSION)" \ docker/build/image