adding the ipxe stuff in the container

This commit is contained in:
Christian Goll
2022-11-29 17:01:36 +01:00
parent de4362f9b9
commit 8514f5aa1b
3 changed files with 4 additions and 6 deletions

View File

@@ -36,6 +36,7 @@ LABEL maintainer="Christian Goll <cgoll@suse.com>"
COPY --from=builder /usr/bin/wwctl /usr/bin/wwctl COPY --from=builder /usr/bin/wwctl /usr/bin/wwctl
COPY --from=builder /var/lib/warewulf /var/lib/warewulf COPY --from=builder /var/lib/warewulf /var/lib/warewulf
COPY --from=builder /usr/share/warewulf /usr/share/warewulf
COPY --from=builder /etc/warewulf /etc/warewulf COPY --from=builder /etc/warewulf /etc/warewulf
COPY --from=builder /warewulf-src/container-scripts /container-scripts COPY --from=builder /warewulf-src/container-scripts /container-scripts
@@ -67,7 +68,7 @@ RUN zypper -n install \
container-scripts/wwctl \ container-scripts/wwctl \
container-scripts/warewulf.service \ container-scripts/warewulf.service \
container-scripts/warewulf-container-manage.sh \ container-scripts/warewulf-container-manage.sh \
container-scripts/config-warewul \ container-scripts/config-warewulf \
/container &&\ /container &&\
mkdir -p /usr/share/bash_completion/completions/ &&\ mkdir -p /usr/share/bash_completion/completions/ &&\
cp /etc/warewulf/bash_completion.d/warewulf /usr/share/bash_completion/completions/wwctl &&\ cp /etc/warewulf/bash_completion.d/warewulf /usr/share/bash_completion/completions/wwctl &&\

View File

@@ -70,4 +70,5 @@ fi
# configure the services of the host by building the host overlay # configure the services of the host by building the host overlay
echo "-- Running wwctl --" echo "-- Running wwctl --"
wwctl overlay build wwctl overlay build
wwctl configure tftp # enable tftp if systemd is running
test -e /run/systemd/system && wwctl configure tftp

View File

@@ -13,7 +13,6 @@ CHROOTDIR=/var/lib/warewulf/chroots
CONTAINERDIR=/var/lib/warewulf/container CONTAINERDIR=/var/lib/warewulf/container
WAREWULFCONF=/etc/warewulf WAREWULFCONF=/etc/warewulf
BASHCOMPLETION=/usr/share/bash_completion/completions/wwctl BASHCOMPLETION=/usr/share/bash_completion/completions/wwctl
CONFSCRIPT=/container/config-warewulf
echo "LABEL INSTALL" echo "LABEL INSTALL"
# ensure all scripts will be present on the host # ensure all scripts will be present on the host
@@ -75,6 +74,3 @@ fi
# containerdir # containerdir
mkdir -p /host/$CONTAINERDIR mkdir -p /host/$CONTAINERDIR
# now config the container
$CONFSCRIPT