mirror of
https://github.com/pi-farm/Docker-PXE-Server.git
synced 2026-10-27 19:15:22 +00:00
Merge-conflict in 99-start-pxe-services.sh resolved
This commit is contained in:
commit
b4c1866925
5 files changed
+35
-8
No files matched your search
@@ -14,6 +14,7 @@ services:
|
||||
- ${PWD}/media:/media/
|
||||
- /boot:/boot
|
||||
- /var/lib/nfs:/var/lib/nfs
|
||||
- /run/rpcbind:/run/rpcbind
|
||||
container_name: pxe-container
|
||||
image: pxe-image
|
||||
|
||||
+4
-3
@@ -1,5 +1,5 @@
|
||||
FROM debian:11-slim
|
||||
RUN apt-get update && apt-get upgrade -y && apt-get autoremove -y && apt-get install unzip fdisk util-linux nano xz-utils wget systemctl sudo git tcpdump zstd -y
|
||||
FROM debian:12-slim
|
||||
RUN apt-get update && apt-get install unzip fdisk util-linux nano xz-utils wget systemctl sudo git tcpdump zstd nfs-kernel-server nfs-common rpcbind -y
|
||||
ADD https://github.com/just-containers/s6-overlay/releases/download/v3.1.6.0/s6-overlay-noarch.tar.xz /tmp
|
||||
ADD https://github.com/just-containers/s6-overlay/releases/download/v3.1.6.0/s6-overlay-aarch64.tar.xz /tmp
|
||||
RUN tar -C / -Jxpf /tmp/s6-overlay-aarch64.tar.xz && tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz && mkdir /app && mkdir /app/RPi-PXE-Server
|
||||
@@ -9,6 +9,7 @@ VOLUME /app/RPi-PXE-Server
|
||||
VOLUME /srv
|
||||
VOLUME /etc/samba
|
||||
VOLUME /boot
|
||||
RUN rm -rf /temp/* && rm -rf /var/lib/apt/lists/*
|
||||
RUN rm -rf /temp/* && rm -rf /var/lib/apt/lists/* && mkdir -p /run/rpcbind /run/sendsigs.omit.d/
|
||||
RUN rm -rf /run/* /var/run/*
|
||||
WORKDIR /app/RPi-PXE-Server
|
||||
ENTRYPOINT [ "/init" ]
|
||||
+18
-3
@@ -1,5 +1,20 @@
|
||||
#!/bin/bash
|
||||
#systemctl start chrony dnsmasq lighttpd nfs-mountd nfs-server nfs-kernel-server nmbd rsync samba-ad-dc smbd
|
||||
##systemctl stop rpcbind
|
||||
#systemctl start rpcbind && systemctl start nfs-kernel-server && rpc.mountd
|
||||
#systemctl status chrony dnsmasq lighttpd nfs-mountd nfs-server nfs-kernel-server nmbd rsync samba-ad-dc smbd
|
||||
|
||||
# 1. Zuerst zwingend rpcbind starten
|
||||
systemctl start rpcbind
|
||||
|
||||
# Kurze Pause, damit der Portmapper-Dienst fully up & running ist
|
||||
sleep 1
|
||||
|
||||
# 2. Erst danach NFS-Dienste und den Rest starten
|
||||
systemctl start chrony dnsmasq lighttpd nfs-mountd nfs-server nfs-kernel-server nmbd rsync samba-ad-dc smbd
|
||||
#systemctl stop rpcbind
|
||||
systemctl start rpcbind && systemctl start nfs-kernel-server && rpc.mountd
|
||||
systemctl status chrony dnsmasq lighttpd nfs-mountd nfs-server nfs-kernel-server nmbd rsync samba-ad-dc smbd
|
||||
|
||||
# 3. Optional: Falls rpc.mountd separat benötigt wird
|
||||
rpc.mountd 2>/dev/null || true
|
||||
|
||||
# 4. Status aller Dienste prüfen
|
||||
systemctl status rpcbind chrony dnsmasq lighttpd nfs-mountd nfs-server nfs-kernel-server nmbd rsync samba-ad-dc smbd
|
||||
Vendored
BIN
Binary file not shown.
@@ -5,8 +5,18 @@ echo "Starte PXE-relevante Dienste via systemctl-shim..."
|
||||
# Fix für rpcbind: Fehlendes Verzeichnis erstellen
|
||||
mkdir -p /run/sendsigs.omit.d
|
||||
|
||||
systemctl start rpcbind
|
||||
systemctl start nfs-kernel-server
|
||||
# rpcbind läuft auf dem Host (network_mode: host)
|
||||
#systemctl start rpcbind
|
||||
|
||||
# NFS:
|
||||
# Das Debian-Init-Skript verweigert den Start, weil es den
|
||||
# hostseitigen rpcbind-Prozess im Container nicht erkennen kann.
|
||||
# nfsd daher direkt starten.
|
||||
echo "Starte NFS kernel daemon..."
|
||||
exportfs -ra
|
||||
rpc.nfsd 8
|
||||
|
||||
echo "Starte PXE-Dienste..."
|
||||
systemctl start dnsmasq
|
||||
systemctl start lighttpd
|
||||
systemctl start smbd
|
||||
|
||||
Reference in new issue
Block a user