Skip to content

Commit

Permalink
More preparation to merge ironic and inspector repos
Browse files Browse the repository at this point in the history
  • Loading branch information
elfosardo committed Mar 16, 2021
1 parent fb76218 commit a437a6a
Show file tree
Hide file tree
Showing 18 changed files with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,17 @@ COPY --from=ironic-builder /tmp/ipxe/src/bin/undionly.kpxe /tmp/ipxe/src/bin-x86

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

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

COPY scripts/ /bin/
COPY config/dnsmasq.conf.j2 /etc/
COPY config/inspector.ipxe.j2 config/dualboot.ipxe /tmp/
COPY ironic-scripts/ /bin/
COPY ironic-config/dnsmasq.conf.j2 /etc/
COPY ironic-config/inspector.ipxe.j2 ironic-config/dualboot.ipxe /tmp/

# Custom httpd config, removes all but the bare minimum needed modules
RUN rm -f /etc/httpd/conf.d/autoindex.conf /etc/httpd/conf.d/welcome.conf /etc/httpd/conf.modules.d/*.conf
COPY config/httpd.conf /etc/httpd/conf.d/
COPY config/httpd-modules.conf /etc/httpd/conf.modules.d/
COPY config/apache2-ironic-api.conf.j2 /etc/httpd-ironic-api.conf.j2
COPY ironic-config/httpd.conf /etc/httpd/conf.d/
COPY ironic-config/httpd-modules.conf /etc/httpd/conf.modules.d/
COPY ironic-config/apache2-ironic-api.conf.j2 /etc/httpd-ironic-api.conf.j2

ENTRYPOINT ["/bin/runironic"]

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit a437a6a

Please sign in to comment.