@@ -5,27 +5,35 @@ FROM quay.io/airshipit/ironic:${OPENSTACK_VERSION}-ubuntu_noble AS build
55
66COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
77
8- COPY python/ironic-understack /src/understack/ironic-understack
9- COPY python/understack-flavor-matcher /src/understack/understack-flavor-matcher
10-
118RUN apt-get update && \
129 apt-get install -y --no-install-recommends \
10+ git \
1311 patch \
14- quilt \
1512 && apt-get clean && rm -rf /var/lib/apt/lists/*
1613
14+ # clone source and patch it
15+ # renovate: name=openstack/ironic repo=https://github.com/rackerlabs/ironic.git branch=understack/2025.2
16+ ARG IRONIC_GIT_REF=3856f2183a4e568eb4f05aa561c8626eb80241c0
17+ ADD --keep-git-dir=true https://github.com/openstack/ironic.git#${IRONIC_GIT_REF} /src/ironic
18+ RUN git -C /src/ironic fetch --unshallow
19+
20+ COPY python/ironic-understack /src/understack/ironic-understack
21+ COPY python/understack-flavor-matcher /src/understack/understack-flavor-matcher
22+
1723ARG OPENSTACK_VERSION="required_argument"
1824ARG NOVNC_VERSION=1.6.0
1925RUN --mount=type=cache,target=/root/.cache/uv \
2026 uv pip install \
27+ --upgrade \
2128 --constraint https://releases.openstack.org/constraints/upper/${OPENSTACK_VERSION} \
29+ /src/ironic \
2230 /src/understack/ironic-understack \
2331 /src/understack/understack-flavor-matcher \
2432 proliantutils==2.16.3
2533
2634COPY containers/ironic/patches /tmp/patches/
2735RUN cd /var/lib/openstack/lib/python3.12/site-packages && \
28- QUILT_PATCHES= /tmp/patches quilt push -a
36+ patch -p1 < /tmp/patches/0001-Solve-IPMI-call-issue-results-in-UTF-8-format-error-.patch
2937
3038# download and unpack novnc
3139RUN \
3644 mkdir -p /usr/share/novnc/ && \
3745 wget -q -O "$DEST_FILE" "$URL" && \
3846 tar -C /usr/share/novnc/ --strip-components=1 -zxvf "${DEST_FILE}" "$PFX/app" "$PFX/core" "$PFX/vendor" "$PFX/vnc.html"
39- COPY containers/ironic/ironic-console-pod.yaml.template /var/lib/openstack/lib/python3.12/site-packages/ironic/console/container/
4047
4148ARG OPENSTACK_VERSION="required_argument"
4249FROM quay.io/airshipit/ironic:${OPENSTACK_VERSION}-ubuntu_noble AS final
0 commit comments