From f950c1d1995d401ef0cc728c1e34ecd217e7b0a3 Mon Sep 17 00:00:00 2001 From: David Wood Date: Wed, 3 Jul 2024 16:21:42 -0400 Subject: [PATCH] apply fix needed for apparent docker/git action problem when runnning build-image.yml (#375) Signed-off-by: David Wood --- .make.defaults | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.make.defaults b/.make.defaults index be2d30dee..f5625aaed 100644 --- a/.make.defaults +++ b/.make.defaults @@ -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) \