"Old" Containerfile being used in the builder machinery

[git-hyagi]

Describe the bug
If we push another version of a Containerfile to Pulp and try to build using it, the builder machinery will not use the latest version.

To Reproduce
Steps to reproduce the behavior:

pulp container repository create --name my-container-repo
pulp file repository create --name my-file-repo
cat<<EOF> /tmp/Containerfile
FROM quay.io/fedora/fedora-bootc:40
RUN dnf install -y hello
EOF
pulp file content upload --relative-path Containerfile --file /tmp/Containerfile --repository my-file-repo
curl ${CONTAINER_REPO}/build_image -F containerfile_name=Containerfile -F build_context={FILE_REPO}versions/1/

echo "RUN dnf install -y vim" >> /tmp/Containerfile
pulp file content upload --relative-path Containerfile --file /tmp/Containerfile --repository my-file-repo
curl ${CONTAINER_REPO}/build_image -F containerfile_name=Containerfile -F build_context={FILE_REPO}versions/2/

The build task will run, but a new manifest will not be created after these steps.

pulp container content -tmanifest list

Additional context
As a workaround, instead of using the same filename, uploading the Containerfile with a different name would work.

maybe modifying the line:

pulp_container/pulp_container/app/tasks/builder.py

Line 149 in 473ec48

for content_artifact in content_artifacts.select_related("artifact").iterator():

to:

            for content_artifact in content_artifacts.select_related("artifact").order_by("pulp_created").iterator():

would fix this issue because the containerfile_artifact would be overwritten with the latest version:

pulp_container/pulp_container/app/tasks/builder.py

Lines 150 to 151 in 473ec48

	if content_artifact.relative_path == containerfile_name:
	containerfile_artifact = content_artifact.artifact

[lubosmj]

How about focusing on this query instead?

pulp_container/pulp_container/app/tasks/builder.py

Lines 146 to 148 in 473ec48

	content_artifacts = ContentArtifact.objects.filter(
	content__pulp_type="file.file", content__repositories__in=[build_context_pk]
	).order_by("-content__pulp_created")

[mdellweg]

Wait a minute. A pulp-file repository should only be able to contain a single file per path. That should already solve any abbiguity. Can you confirm that uploading a second "Containerfile" will indeed replace the first one? Sorting anything by pulp_created here is by no means a solution to the issue, because the content added to the repository by the second upload could already have been in pulp for a very long time...