diff --git a/Dockerfile b/Dockerfile index 0fccc2e..78c294a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM scratch -COPY --from=qemux/qemu-arm:1.14 / / +COPY --from=qemux/qemu-arm:1.15 / / ARG DEBCONF_NOWARNINGS "yes" ARG DEBIAN_FRONTEND "noninteractive" diff --git a/readme.md b/readme.md index 0a9f0a1..0fbd9b8 100644 --- a/readme.md +++ b/readme.md @@ -151,7 +151,7 @@ docker run -it --rm --name windows -p 8006:8006 --device=/dev/kvm --cap-add NET_ - /home/user/example.iso:/storage/custom.iso ``` - Replace the example path `/home/user/example.iso` with the filename of the desired ISO file. + Replace the example path `/home/user/example.iso` with the filename of the desired ISO file. The value of `VERSION` will be ignored in this case. * ### How do I customize the installation? diff --git a/src/samba.sh b/src/samba.sh index 18f7687..2731786 100644 --- a/src/samba.sh +++ b/src/samba.sh @@ -3,22 +3,27 @@ set -Eeuo pipefail : "${SAMBA:="Y"}" -[[ "$DHCP" == [Yy1]* ]] && return 0 [[ "$SAMBA" != [Yy1]* ]] && return 0 [[ "$NETWORK" != [Yy1]* ]] && return 0 -SHARE="$STORAGE/shared" +hostname="host.lan" +interface="dockerbridge" -mkdir -p "$SHARE" -chmod -R 777 "$SHARE" +if [[ "$DHCP" == [Yy1]* ]]; then + hostname="$IP" + interface="$VM_NET_DEV" +fi -SAMBA="/etc/samba/smb.conf" +share="$STORAGE/shared" + +mkdir -p "$share" +[ -z "$(ls -A "$share")" ] && chmod -R 777 "$share" { echo "[global]" echo " server string = Dockur" - echo " netbios name = dockur" + echo " netbios name = $hostname" echo " workgroup = WORKGROUP" - echo " interfaces = dockerbridge" + echo " interfaces = $interface" echo " bind interfaces only = yes" echo " security = user" echo " guest account = nobody" @@ -32,14 +37,14 @@ SAMBA="/etc/samba/smb.conf" echo " disable spoolss = yes" echo "" echo "[Data]" - echo " path = $SHARE" + echo " path = $share" echo " comment = Shared" echo " writable = yes" echo " guest ok = yes" echo " guest only = yes" echo " force user = root" echo " force group = root" -} > "$SAMBA" +} > "/etc/samba/smb.conf" { echo "--------------------------------------------------------" echo " $APP for Docker v$( "$SHARE/readme.txt" +} | unix2dos > "$share/readme.txt" ! smbd && smbd --debug-stdout # Enable Web Service Discovery -wsdd -i dockerbridge -p -n "host.lan" & +wsdd -i "$interface" -p -n "$hostname" & return 0