Dockerfile

@@ -19,7 +19,7 @@ RUN set -eu && \
         cabextract \
         libxml2-utils \
         libarchive-tools && \
-    wget "https://github.com/gershnik/wsdd-native/releases/download/v1.22/wsddn_1.22_${TARGETARCH}.deb" -O /tmp/wsddn.deb -q && \
+    wget "https://github.com/gershnik/wsdd-native/releases/download/v1.21/wsddn_1.21_${TARGETARCH}.deb" -O /tmp/wsddn.deb -q && \
     dpkg -i /tmp/wsddn.deb && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

readme.md

@@ -53,7 +53,7 @@ services:
 ##### Via Docker CLI:
 
 ```bash
-docker run -it --rm --name windows -e "VERSION=11" -p 8006:8006 --device=/dev/kvm --device=/dev/net/tun --cap-add NET_ADMIN -v "${PWD:-.}/windows:/storage" --stop-timeout 120 docker.io/dockurr/windows
+docker run -it --rm --name windows -p 8006:8006 --device=/dev/kvm --device=/dev/net/tun --cap-add NET_ADMIN -v "${PWD:-.}/windows:/storage" --stop-timeout 120 dockurr/windows
 ```
 
 ##### Via Kubernetes:

src/entry.sh

@@ -39,8 +39,6 @@ terminal
 tail -fn +0 "$QEMU_LOG" --pid=$$ 2>/dev/null &
 cat "$QEMU_TERM" 2> /dev/null | tee "$QEMU_PTY" | \
 sed -u -e 's/\x1B\[[=0-9;]*[a-z]//gi' \
--e 's/\x1B\x63//g' -e 's/\x1B\[[=?]7l//g' \
--e '/^$/d' -e 's/\x44\x53\x73//g' \
 -e 's/failed to load Boot/skipped Boot/g' \
 -e 's/0): Not Found/0)/g' & wait $! || :
 

src/samba.sh

@@ -46,14 +46,10 @@ addShare() {
   local cfg="$5"
   local owner=""
 
-  if ! mkdir -p "$dir"; then
-    error "Failed to create directory $dir." && return 1
-  fi
+  mkdir -p "$dir" || return 1
 
   if ! ls -A "$dir" >/dev/null 2>&1; then
-    msg="Failed to access directory $dir."
-    msg+=" If SELinux is active, you need to add the \":Z\" flag to the bind mount."
-    error "$msg" && return 1
+    error "Failed to access directory $dir" && return 1
   fi
 
   if [ -z "$(ls -A "$dir")" ]; then
@@ -140,21 +136,26 @@ share="/shared"
 [ ! -d "$share" ] && [ -d "$STORAGE/data" ] && share="$STORAGE/data"
 [ ! -d "$share" ] && share="$tmp"
 
-! addShare "$share" "/shared" "Data" "Shared" "$SAMBA_CONFIG" && return 0
+m1="Failed to add shared folder"
+m2="Please check its permissions."
+
+if ! addShare "$share" "/shared" "Data" "Shared" "$SAMBA_CONFIG"; then
+  error "$m1 '$share'. $m2" && return 0
+fi
 
 if [ -d "/shared2" ]; then
-  addShare "/shared2" "/shared2" "Data2" "Shared" "$SAMBA_CONFIG" || :
+  addShare "/shared2" "/shared2" "Data2" "Shared" "$SAMBA_CONFIG" || error "$m1 '/shared2'. $m2"
 else
   if [ -d "/data2" ]; then
-    addShare "/data2" "/shared2" "Data2" "Shared" "$SAMBA_CONFIG" || :
+    addShare "/data2" "/shared2" "Data2" "Shared" "$SAMBA_CONFIG" || error "$m1 '/data2'. $m2."
   fi
 fi
 
 if [ -d "/shared3" ]; then
-  addShare "/shared3" "/shared3" "Data3" "Shared" "$SAMBA_CONFIG" || :
+  addShare "/shared3" "/shared3" "Data3" "Shared" "$SAMBA_CONFIG" || error "$m1 '/shared3'. $m2"
 else
   if [ -d "/data3" ]; then
-    addShare "/data3" "/shared3" "Data3" "Shared" "$SAMBA_CONFIG" || :
+    addShare "/data3" "/shared3" "Data3" "Shared" "$SAMBA_CONFIG" || error "$m1 '/data3'. $m2"
   fi
 fi