From db35ac8d793506bc43b62e7e39d27a75de1043ed Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Mon, 6 Jul 2026 15:26:00 +0200 Subject: Migrate to pyproject.toml [tool.setuptools.data-files] does not support recursive directory installation. The old setup.cfg [files] worked because PBR's FilesConfig.expand_globs() used os.walk() to expand docker/*, but this hook is not triggered by the pbr.build PEP-517 backend. Move docker/ into kolla/ and use [tool.setuptools.package-data] instead. Update kolla_worker._get_images_dir() to check the kolla package directory first so both editable and regular installs work. Change-Id: I4fc452c03740ef22ebbb4e8d0d86c4f4783e2d09 Signed-off-by: Michal Nasiadka --- kolla/docker/watcher/watcher-engine/Dockerfile.j2 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 kolla/docker/watcher/watcher-engine/Dockerfile.j2 (limited to 'kolla/docker/watcher/watcher-engine') diff --git a/kolla/docker/watcher/watcher-engine/Dockerfile.j2 b/kolla/docker/watcher/watcher-engine/Dockerfile.j2 new file mode 100644 index 000000000..2518a92b6 --- /dev/null +++ b/kolla/docker/watcher/watcher-engine/Dockerfile.j2 @@ -0,0 +1,15 @@ +FROM {{ namespace }}/{{ image_prefix }}watcher-base:{{ tag }} +{% block labels %} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" +{% endblock %} + +{% block watcher_engine_header %}{% endblock %} + +{% import "macros.j2" as macros with context %} + +{{ macros.kolla_patch_sources() }} + +{% block watcher_engine_footer %}{% endblock %} +{% block footer %}{% endblock %} + +USER watcher -- cgit v1.2.3