From 288fc6233a95caf20a67bfdc628425abc798e7bd Mon Sep 17 00:00:00 2001 From: David Chase Date: Fri, 22 Aug 2025 14:31:12 -0400 Subject: [PATCH] fix: correct build context for dotnet8-builder Docker image The dotnet8 builder Dockerfile requires files from both the builder/ subdirectory and the parent dotnet8/ directory (Fission.DotNet.Common source files). This fix updates both Makefiles to use the parent dotnet8 directory as the Docker build context, matching the approach used by dotnet8-env-img. Changes: - dotnet8/builder/Makefile: Use parent directory as build context - dotnet8/Makefile: Use parent directory as build context for builder image This resolves the GitHub Actions build failure where files were not found. --- dotnet8/Makefile | 4 ++-- dotnet8/builder/Makefile | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dotnet8/Makefile b/dotnet8/Makefile index b8c53c79..c44d48b4 100644 --- a/dotnet8/Makefile +++ b/dotnet8/Makefile @@ -11,5 +11,5 @@ dotnet8-env-img: Dockerfile docker build --platform=$(PLATFORMS) -t $(REPO)/dotnet8-env:$(TAG) -f $< . dotnet8-builder-img: builder/Dockerfile - @echo === Building image $(REPO)/dotnet8-builder:$(TAG) using context $(CURDIR)/builder and dockerfile $< - docker build --platform=$(PLATFORMS) -t $(REPO)/dotnet8-builder:$(TAG) -f $< builder/ \ No newline at end of file + @echo === Building image $(REPO)/dotnet8-builder:$(TAG) using context $(CURDIR) and dockerfile $< + docker build --platform=$(PLATFORMS) -t $(REPO)/dotnet8-builder:$(TAG) -f $< . \ No newline at end of file diff --git a/dotnet8/builder/Makefile b/dotnet8/builder/Makefile index 5bb6fbc0..a2a171af 100644 --- a/dotnet8/builder/Makefile +++ b/dotnet8/builder/Makefile @@ -5,4 +5,7 @@ PLATFORMS ?= linux/amd64,linux/arm64 .PHONY: all all: dotnet8-builder-img -dotnet8-builder-img: Dockerfile \ No newline at end of file +# Override the rule to use parent directory as context +dotnet8-builder-img: Dockerfile + @echo === Building image $(REPO)/dotnet8-builder:$(TAG) using parent directory as context + cd .. && docker buildx build --platform=$(PLATFORMS) -t $(REPO)/dotnet8-builder:$(TAG) $(DOCKER_FLAGS) -f builder/Dockerfile . \ No newline at end of file