From bd3685b60ed122284380bcdfdfe2c1bb4be2311d Mon Sep 17 00:00:00 2001 From: kpango Date: Thu, 21 Dec 2023 14:54:49 +0900 Subject: [PATCH] [bugfix] CI, Docker EXTRA_ARGS not working problem Signed-off-by: kpango --- .github/actions/docker-build/action.yaml | 2 +- Makefile.d/docker.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/docker-build/action.yaml b/.github/actions/docker-build/action.yaml index 2001b6108a..de68fa6500 100644 --- a/.github/actions/docker-build/action.yaml +++ b/.github/actions/docker-build/action.yaml @@ -106,7 +106,7 @@ runs: DOCKER="docker" \ BUILDKIT_INLINE_CACHE=0 \ DOCKER_OPTS="--platform ${PLATFORMS} --builder ${BUILDER} ${LABEL_OPTS} --label org.opencontainers.image.version=${PRIMARY_TAG} --label org.opencontainers.image.title=${TARGET}" \ - EXTRA_TAGS="${EXTRA_TAGS}" \ + EXTRA_ARGS="${EXTRA_TAGS}" \ TAG="${PRIMARY_TAG}" \ docker/build/${TARGET} env: diff --git a/Makefile.d/docker.mk b/Makefile.d/docker.mk index 2749e4f0f8..e9e924eb2f 100644 --- a/Makefile.d/docker.mk +++ b/Makefile.d/docker.mk @@ -169,7 +169,7 @@ docker/name/operator/helm: docker/build/operator/helm: @make DOCKERFILE="$(ROOTDIR)/dockers/operator/helm/Dockerfile" \ IMAGE=$(HELM_OPERATOR_IMAGE) \ - EXTRA_ARGS="--build-arg OPERATOR_SDK_VERSION=$(OPERATOR_SDK_VERSION) --build-arg UPX_OPTIONS=$(UPX_OPTIONS)" \ + EXTRA_ARGS="--build-arg OPERATOR_SDK_VERSION=$(OPERATOR_SDK_VERSION) --build-arg UPX_OPTIONS=$(UPX_OPTIONS) $(EXTRA_ARGS)" \ docker/build/image .PHONY: docker/name/loadtest