[bugfix] CI, Docker EXTRA_ARGS not working problem (#2278)

Signed-off-by: kpango <kpango@vdaas.org>
vdaas · Dec 22, 2023 · d0588fe · d0588fe
1 parent b74aba6
commit d0588fe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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