Skip to content

Commit

Permalink
apply fix needed for apparent docker/git action problem when runnning…
Browse files Browse the repository at this point in the history
… build-image.yml (#375)

Signed-off-by: David Wood <[email protected]>
  • Loading branch information
daw3rd authored Jul 3, 2024
1 parent f34536c commit f950c1d
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions .make.defaults
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,16 @@ __check_defined = \
.PHONY: .defaults.image
.defaults.image:: # Must be called with a DOCKER_IMAGE= settings.
@# Help: Create the docker image $(DOCKER_LOCAL_IMAGE) and a tag for $(DOCKER_REMOTE_IMAGE)
# The following touch seems to be needed to work around a docker build problem in which
# it seemed to be using a pyproject from a previously built image. Specifically, malware's
# ray pyproject.toml seemed to be copied into the image instead of the proglang_select python version.
# This could not be reproduced locally and was only seen when running as the build-image.yml workflow
#if [ -e pyproject.toml ]; then \
# cat pyproject.toml; \
#fi
if [ -e pyproject.toml ]; then \
touch pyproject.toml; \
fi
$(DOCKER) build -t $(DOCKER_LOCAL_IMAGE) \
--build-arg EXTRA_INDEX_URL=$(EXTRA_INDEX_URL) \
--build-arg BASE_IMAGE=$(BASE_IMAGE) \
Expand Down

0 comments on commit f950c1d

Please sign in to comment.