Skip to content

Commit

Permalink
docker: Fix --build-arg passing from Makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
cassava committed Mar 14, 2023
1 parent 50c9d95 commit fab9c13
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Makefile.docker
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,19 @@ endif

ifeq ($(shell [ -f ${PROJECT_ROOT}/setup.sh ] && echo "true"),true)
DOCKER_BUILD_ARGS += --secret id=setup,src=${PROJECT_ROOT}/setup.sh
DOCKER_RUN_ARGS += -v ${PROJECT_ROOT}/setup.sh:/root/setup.sh
DOCKER_RUN_ARGS += -v "${PROJECT_ROOT}/setup.sh:/root/setup.sh"
endif

ifneq (${CONAN_PROFILE},)
DOCKER_BUILD_ARGS += --build-arg CONAN_PROFILE=${CONAN_PROFILE}
DOCKER_BUILD_ARGS += --build-arg CONAN_PROFILE="${CONAN_PROFILE}"
endif

ifneq (${VENDOR_TARGET},)
DOCKER_BUILD_ARGS += --build-arg VENDOR_TARGET=${VENDOR_TARGET}
DOCKER_BUILD_ARGS += --build-arg VENDOR_TARGET="${VENDOR_TARGET}"
endif

ifneq (${PACKAGE_TARGET},)
DOCKER_BUILD_ARGS += --build-arg PACKAGE_TARGET=${PACKAGE_TARGET}
DOCKER_BUILD_ARGS += --build-arg PACKAGE_TARGET="${PACKAGE_TARGET}"
endif

ifeq (${KEEP_SOURCES},1)
Expand Down

0 comments on commit fab9c13

Please sign in to comment.