Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare merging ironic and ironic-inspector repositories #241

Merged
merged 1 commit into from
Mar 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## Build iPXE w/ IPv6 Support
## Note: we are pinning to a specific commit for reproducible builds.
## Updated as needed.
FROM docker.io/centos:centos8 AS builder
FROM docker.io/centos:centos8 AS ironic-builder
RUN dnf install -y gcc git make xz-devel
WORKDIR /tmp
COPY . .
Expand Down Expand Up @@ -31,7 +31,7 @@ RUN if [ $(uname -m) = "x86_64" ]; then \

FROM docker.io/centos:centos8

ENV PKGS_LIST=main-packages-list.txt
ENV PKGS_LIST=ironic-packages-list.txt
ARG EXTRA_PKGS_LIST
ARG PATCH_LIST

Expand All @@ -41,9 +41,9 @@ COPY prepare-image.sh patch-image.sh /bin/
RUN prepare-image.sh && \
rm -f /bin/prepare-image.sh

COPY --from=builder /tmp/ipxe/src/bin/undionly.kpxe /tmp/ipxe/src/bin-x86_64-efi/snponly.efi /tmp/ipxe/src/bin-x86_64-efi/ipxe.efi /tftpboot/
COPY --from=ironic-builder /tmp/ipxe/src/bin/undionly.kpxe /tmp/ipxe/src/bin-x86_64-efi/snponly.efi /tmp/ipxe/src/bin-x86_64-efi/ipxe.efi /tftpboot/

COPY --from=builder /tmp/esp.img /tmp/uefi_esp.img
COPY --from=ironic-builder /tmp/esp.img /tmp/uefi_esp.img

COPY config/ironic.conf.j2 /etc/ironic/

Expand Down
File renamed without changes.