From d00b6ece5fb5a899447fa2d42b42d331b488227ca472518a60d9abc0df7fe418 Mon Sep 17 00:00:00 2001 From: Marco Chiappero Date: Mon, 30 Jun 2025 12:55:07 +0000 Subject: [PATCH] Move the copy of Jinja templates to resemble upstream Follow the same location for the COPY command moving the Jinja template files in the image. Signed-off-by: Marco Chiappero --- ironic-image/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ironic-image/Dockerfile b/ironic-image/Dockerfile index b867f25..a304a0a 100644 --- a/ironic-image/Dockerfile +++ b/ironic-image/Dockerfile @@ -71,6 +71,9 @@ COPY scripts/ /bin/ COPY configure-nonroot.sh /bin/ RUN set -euo pipefail; chmod +x /bin/configure-ironic.sh /bin/rundnsmasq /bin/runhttpd /bin/runironic /bin/runlogwatch.sh /bin/configure-nonroot.sh +COPY ironic-config/inspector.ipxe.j2 ironic-config/httpd-ironic-api.conf.j2 \ + ironic-config/ipxe_config.template /tmp/ + # IRONIC # RUN cp /usr/share/ipxe/undionly.kpxe /tftpboot/undionly.kpxe #!ArchExclusiveLine: x86_64 @@ -86,7 +89,6 @@ COPY --from=base /tmp/esp-x86_64.img /tmp/uefi_esp-x86_64.img COPY --from=base /tmp/esp-aarch64.img /tmp/uefi_esp-arm64.img COPY ironic-config/ironic.conf.j2 /etc/ironic/ -COPY ironic-config/inspector.ipxe.j2 ironic-config/httpd-ironic-api.conf.j2 ironic-config/ipxe_config.template /tmp/ COPY ironic-config/network-data-schema-empty.json /etc/ironic/ # DNSMASQ -- 2.49.0