From dd5ebc60406fec677190df5912bbb4ce91c28a7c Mon Sep 17 00:00:00 2001 From: Kiichiro YUKAWA Date: Fri, 25 Oct 2024 13:29:51 +0900 Subject: [PATCH] Fix bind DOCKER_OPTS option (#2718) * :bug: Fix bind DOCKER_OPTS option Signed-off-by: vankichi * Fix --------- Signed-off-by: vankichi --- .github/workflows/dockers-example-client-image.yaml | 1 - Makefile.d/docker.mk | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dockers-example-client-image.yaml b/.github/workflows/dockers-example-client-image.yaml index 32fa1674eec..95e2ac3a713 100644 --- a/.github/workflows/dockers-example-client-image.yaml +++ b/.github/workflows/dockers-example-client-image.yaml @@ -73,5 +73,4 @@ jobs: uses: ./.github/workflows/_docker-image.yaml with: target: example-client - platforms: linux/amd64,linux/arm64 secrets: inherit diff --git a/Makefile.d/docker.mk b/Makefile.d/docker.mk index 3e0f7563fe8..7a09d688e37 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