Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix bind DOCKER_OPTS option #2718

Merged
merged 2 commits into from
Oct 25, 2024
Merged

Fix bind DOCKER_OPTS option #2718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ee0428
:bug: Fix bind DOCKER_OPTS option
vankichi Oct 24, 2024
9b2dfdb
Fix
vankichi Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/dockers-example-client-image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,5 +73,4 @@ jobs:
uses: ./.github/workflows/_docker-image.yaml
with:
target: example-client
platforms: linux/amd64,linux/arm64
secrets: inherit
6 changes: 3 additions & 3 deletions Makefile.d/docker.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand All @@ -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