aboutsummaryrefslogtreecommitdiff
path: root/docker/base/kolla_patch.sh
diff options
context:
space:
mode:
authorMichal Nasiadka <mnasiadka@gmail.com>2026-07-06 15:26:00 +0200
committerMichal Nasiadka <mnasiadka@gmail.com>2026-07-06 19:59:40 +0000
commitdb35ac8d793506bc43b62e7e39d27a75de1043ed (patch)
treefeec28d13a43490f5fd4260374144a1abfc20331 /docker/base/kolla_patch.sh
parent1ae1850557e3b99902f73b32c9005618537a1f2d (diff)
downloadkolla-db35ac8d793506bc43b62e7e39d27a75de1043ed.tar.gz
kolla-db35ac8d793506bc43b62e7e39d27a75de1043ed.zip
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 <mnasiadka@gmail.com>
Diffstat (limited to 'docker/base/kolla_patch.sh')
-rwxr-xr-xdocker/base/kolla_patch.sh55
1 files changed, 0 insertions, 55 deletions
diff --git a/docker/base/kolla_patch.sh b/docker/base/kolla_patch.sh
deleted file mode 100755
index b17a5b61d..000000000
--- a/docker/base/kolla_patch.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-# This script works as debian quilt patch.
-# So, patch files included in /patches/series
-# are applied and information what was applied
-# is stored in /etc/kolla/patched.
-#
-# No more, no less :)
-
-cd /
-
-# If exist /patches/series
-# let's try to apply patches
-if [ -e "/patches/series" ]; then
- # If there is /patches/series.applied
- # then it means previous run already applied
- # some patches - from another intermediate container
- #
- # So, let's add patches again to /patches/series
- # and let's script to handle it
- if [ -e "/patches/series.applied" ]; then
- grep -v '^#' /patches/series.applied > /tmp/series.tmp
- grep -v '^#' /patches/series >> /tmp/series.tmp
- rm -f /patches/series
- mv /tmp/series.tmp /patches/series
- fi
- touch /etc/kolla/patched
- for patchfile in $(grep -v '^#' /patches/series); do
- # If patch is not applied, try to apply it, otherwise
- # inform user that patchfile is already applied
- if ! grep -q "$patchfile" /etc/kolla/patched; then
- echo "[i] Applying /patches/${patchfile}"
- patch -p0 --fuzz=0 --ignore-whitespace < /patches/${i}/${patchfile}
- # If apply patch was successful inform user,
- # otherwise fail build process and inform user
- # to check/fix patch
- if [ $? -eq 0 ]; then
- echo "[i] Applied /patches/${patchfile}" >> /etc/kolla/patched
- else
- echo "[i] Patch /patches/${patchfile} failed, please fix your patchfiles."
- exit 1
- fi
- else
- echo "[i] /patches/${patchfile} already applied."
- fi
- done
- # Ignore files which are commented and move
- # to /patches/series.applied as /patch/series
- # can be potentially replaced by another files
- # from different intermediate container
- grep -v '^#' /patches/series > /patches/series.applied
- rm -f /patches/series
-else
- echo "[i] No series file found, nothing to patch."
-fi