Merge pull request #162 from shanejbrown/source-image-fix

shanejbrown · web-flow · commit ab274319eef3 · 2024-09-19T16:34:29.000-06:00
Create unique source image layer
diff --git a/buildrunner/SourceDockerfile b/buildrunner/SourceDockerfile
@@ -3,3 +3,6 @@ FROM $DOCKER_REGISTRY/busybox:latest
 ADD source.tar /source/
 VOLUME /source
 
+# Adding unique layers to avoid image conflicts with parallel buildrunner executions
+ARG BUILDRUNNER_DISTRO
+RUN echo "Building on $BUILDRUNNER_DISTRO (random number: $((RANDOM)))" > /build_info.txt
diff --git a/buildrunner/__init__.py b/buildrunner/__init__.py
@@ -307,6 +307,9 @@ def get_source_image(self):
                         inject=inject,
                         cache=False,
                         pull=False,
+                        build_args={
+                            "BUILDRUNNER_DISTRO": os.environ.get("BUILDRUNNER_DISTRO")
+                        },
                     )
                 )
                 if len(built_images_info.built_images) != 1:

Original file line number	Diff line number	Diff line change
`@@ -307,6 +307,9 @@ def get_source_image(self):`
`307`	`307`	`inject=inject,`
`308`	`308`	`cache=False,`
`309`	`309`	`pull=False,`
	`310`	`+ build_args={`
	`311`	`+ "BUILDRUNNER_DISTRO": os.environ.get("BUILDRUNNER_DISTRO")`
	`312`	`+ },`
`310`	`313`	`)`
`311`	`314`	`)`
`312`	`315`	`if len(built_images_info.built_images) != 1:`