Skip to content

Commit

Permalink
Add make targets specifically for application images
Browse files Browse the repository at this point in the history
  • Loading branch information
jimmymathews committed Jun 21, 2024
1 parent 2140048 commit 4b2e093
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,13 @@ pyproject.toml: pyproject.toml.unversioned ${BUILD_SCRIPTS_LOCATION_ABSOLUTE}/cr
print-source-files:
>@echo "${PACKAGE_SOURCE_FILES}" | tr ' ' '\n'

build-and-push-application-images: ${DOCKER_PUSH_SUBMODULE_TARGETS}

build-and-push-docker-images: ${DOCKER_PUSH_SUBMODULE_TARGETS} ${DOCKER_PUSH_PLUGIN_TARGETS} ${DOCKER_PUSH_PLUGIN_CUDA_TARGETS} generic-spt-push-target data-loaded-images-push-target

build-and-push-docker-images-dev: ${DOCKER_PUSH_DEV_SUBMODULE_TARGETS} ${DOCKER_PUSH_DEV_PLUGIN_TARGETS} ${DOCKER_PUSH_DEV_PLUGIN_CUDA_TARGETS}

${DOCKER_PUSH_SUBMODULE_TARGETS}: build-docker-images check-for-docker-credentials
${DOCKER_PUSH_SUBMODULE_TARGETS}: ${DOCKER_BUILD_SUBMODULE_TARGETS} check-for-docker-credentials
>@submodule_directory=$$(echo $@ | sed 's/^docker-push-//g') ; \
submodule_version=$$(grep '^__version__ = ' $$submodule_directory/__init__.py | grep -o '[0-9]\+\.[0-9]\+\.[0-9]\+') ;\
submodule_name=$$(echo $$submodule_directory | sed 's/spatialprofilingtoolbox\///g') ; \
Expand Down Expand Up @@ -336,6 +338,8 @@ check-dockerfiles-consistency:
ensure-plugin-submodules-are-populated:
>@git submodule update --init --recursive

build-application-images: ${DOCKER_BUILD_SUBMODULE_TARGETS}

build-docker-images: ${DOCKER_BUILD_SUBMODULE_TARGETS} ${DOCKER_BUILD_PLUGIN_TARGETS} ${DOCKER_BUILD_PLUGIN_CUDA_TARGETS}

# Build the Docker container for each submodule by doing the following:
Expand Down

0 comments on commit 4b2e093

Please sign in to comment.