diff --git a/ironic-image/Dockerfile b/ironic-image/Dockerfile index 7d3d78b..dc4995a 100644 --- a/ironic-image/Dockerfile +++ b/ironic-image/Dockerfile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -#!BuildTag: %%IMG_PREFIX%%ironic:26.1.2.1 -#!BuildTag: %%IMG_PREFIX%%ironic:26.1.2.1-%RELEASE% +#!BuildTag: %%IMG_PREFIX%%ironic:26.1.2.2 +#!BuildTag: %%IMG_PREFIX%%ironic:26.1.2.2-%RELEASE% #!BuildVersion: 15.6 ARG SLE_VERSION @@ -46,8 +46,8 @@ LABEL org.opencontainers.image.description="Openstack Ironic based on the SLE Ba LABEL org.opencontainers.image.url="https://www.suse.com/products/server/" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="SUSE LLC" -LABEL org.opencontainers.image.version="26.1.2.1" -LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic:26.1.2.1-%RELEASE%" +LABEL org.opencontainers.image.version="26.1.2.2" +LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic:26.1.2.2-%RELEASE%" LABEL org.openbuildservice.disturl="%DISTURL%" LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%" LABEL com.suse.eula="SUSE Combined EULA February 2024" diff --git a/ironic-image/runlogwatch.sh b/ironic-image/runlogwatch.sh index 525cd7d..b5bcabb 100644 --- a/ironic-image/runlogwatch.sh +++ b/ironic-image/runlogwatch.sh @@ -3,6 +3,14 @@ # Ramdisk logs path LOG_DIR="/shared/log/ironic/deploy" +# The ironic container creates the directory, wait for +# it to exist before running inotifywait or it can fail causing +# a spurious restart +while [ ! -d "${LOG_DIR}" ]; do + echo "Waiting for ${LOG_DIR}" + sleep 5 +done + inotifywait -m "${LOG_DIR}" -e close_write | while read -r path _action file; do echo "************ Contents of ${path}/${file} ramdisk log file bundle **************"