feat: Add Windows 11 LTSC (#774)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.github/workflows/build.yml

@@ -69,7 +69,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true

Dockerfile

@@ -1,5 +1,5 @@
 FROM scratch
-COPY --from=qemux/qemu-docker:5.08 / /
+COPY --from=qemux/qemu-docker:6.03 / /
 
 ARG VERSION_ARG="0.0"
 ARG DEBCONF_NOWARNINGS="yes"
@@ -28,14 +28,14 @@ COPY --chmod=755 ./src /run/
 COPY --chmod=755 ./assets /run/assets
 
 ADD --chmod=755 https://raw.githubusercontent.com/christgau/wsdd/v0.8/src/wsdd.py /usr/sbin/wsdd
-ADD --chmod=664 https://github.com/qemus/virtiso/releases/download/v0.1.248/virtio-win-0.1.248.tar.xz /drivers.txz
+ADD --chmod=664 https://github.com/qemus/virtiso-whql/releases/download/v1.9.43-0/virtio-win-1.9.43.tar.xz /drivers.txz
 
 EXPOSE 8006 3389
 VOLUME /storage
 
-ENV RAM_SIZE "4G"
-ENV CPU_CORES "2"
-ENV DISK_SIZE "64G"
-ENV VERSION "win11"
+ENV RAM_SIZE="4G"
+ENV CPU_CORES="2"
+ENV DISK_SIZE="64G"
+ENV VERSION="win11"
 
 ENTRYPOINT ["/usr/bin/tini", "-s", "/run/entry.sh"]

assets/win11x64-iot.xml

@@ -86,6 +86,9 @@
         <AcceptEula>true</AcceptEula>
         <FullName>Docker</FullName>
         <Organization>Windows for Docker</Organization>
+        <ProductKey>
+          <Key />
+        </ProductKey>
       </UserData>
       <EnableFirewall>false</EnableFirewall>
       <Diagnostics>

assets/win11x64-ltsc.xml

@@ -86,6 +86,9 @@
         <AcceptEula>true</AcceptEula>
         <FullName>Docker</FullName>
         <Organization>Windows for Docker</Organization>
+        <ProductKey>
+          <Key />
+        </ProductKey>
       </UserData>
       <EnableFirewall>false</EnableFirewall>
       <Diagnostics>

kubernetes.yml

@@ -27,9 +27,6 @@ spec:
           protocol: TCP
         - containerPort: 3389
           protocol: UDP
-      resources:
-        limits:
-          devices.kubevirt.io/kvm: 1
       securityContext:
         privileged: true
       env:
@@ -42,10 +39,15 @@ spec:
       volumeMounts:
         - mountPath: /storage
           name: storage
+        - mountPath: /dev/kvm
+          name: dev-kvm
   volumes:
     - name: storage
       persistentVolumeClaim:
         claimName: windows-pvc
+    - name: dev-kvm
+      hostPath:
+        path: /dev/kvm
 ---
 apiVersion: v1
 kind: Service
@@ -60,14 +62,11 @@ spec:
       protocol: TCP
       port: 8006
       targetPort: 8006
-      nodePort: 48006
     - name: tcp-3389
       protocol: TCP
       port: 3389
       targetPort: 3389
-      nodePort: 43389
     - name: udp-3389
       protocol: UDP
       port: 3389
       targetPort: 3389
-      nodePort: 43388

readme.md

@@ -7,24 +7,25 @@
 [![Build]][build_url]
 [![Version]][tag_url]
 [![Size]][tag_url]
+[![Package]][pkg_url]
 [![Pulls]][hub_url]
 
 </div></h1>
 
 Windows inside a Docker container.
 
-## Features
+## Features ✨
 
  - Multi-language
  - ISO downloader
  - KVM acceleration
  - Web-based viewer
 
-## Video
+## Video 📺
 
 [![Youtube](https://img.youtube.com/vi/xhGYobuG508/0.jpg)](https://www.youtube.com/watch?v=xhGYobuG508)
 
-## Usage
+## Usage 🐳
 
 Via Docker Compose:
 
@@ -58,9 +59,9 @@ Via Kubernetes:
 kubectl apply -f kubernetes.yml
 ```
 
-## FAQ
+## FAQ 💬
 
-* ### How do I use it?
+### How do I use it?
 
   Very simple! These are the steps:
   
@@ -72,7 +73,7 @@ kubectl apply -f kubernetes.yml
   
   Enjoy your brand new machine, and don't forget to star this repo!
 
-* ### How do I select the Windows version?
+### How do I select the Windows version?
 
   By default, Windows 11 will be installed. But you can add the `VERSION` environment variable to your compose file, in order to specify an alternative Windows version to be downloaded:
 
@@ -85,50 +86,56 @@ kubectl apply -f kubernetes.yml
   
   | **Value** | **Version**              | **Size** |
   |---|---|---|
-  | `win11`   | Windows 11 Pro           | 6.4 GB   |
+  | `win11`   | Windows 11 Pro           | 5.4 GB   |
+  | `ltsc11`  | Windows 11 LTSC    | 4.2 GB   |
   | `win11e`  | Windows 11 Enterprise    | 5.8 GB   |
+  ||||
   | `win10`   | Windows 10 Pro           | 5.7 GB   |
   | `ltsc10`  | Windows 10 LTSC          | 4.6 GB   |
   | `win10e`  | Windows 10 Enterprise    | 5.2 GB   |
-  ||||  
+  ||||
   | `win8`    | Windows 8.1 Pro          | 4.0 GB   |
   | `win8e`   | Windows 8.1 Enterprise   | 3.7 GB   |
   | `win7`    | Windows 7 Enterprise     | 3.0 GB   |
   | `vista`   | Windows Vista Enterprise | 3.0 GB   |
   | `winxp`   | Windows XP Professional  | 0.6 GB   |
   ||||
+  | `2025`    | Windows Server 2025      | 5.0 GB   |
   | `2022`    | Windows Server 2022      | 4.7 GB   |
   | `2019`    | Windows Server 2019      | 5.3 GB   |
   | `2016`    | Windows Server 2016      | 6.5 GB   |
   | `2012`    | Windows Server 2012      | 4.3 GB   |
   | `2008`    | Windows Server 2008      | 3.0 GB   |
-  ||||
-  | `core11`  | Tiny 11 Core             | 2.1 GB   |
-  | `tiny11`  | Tiny 11                  | 3.8 GB   |
-  | `tiny10`  | Tiny 10                  | 3.6 GB   |
+  | `2003`    | Windows Server 2003      | 0.6 GB   |
 
-  To install ARM64 versions of Windows use [dockur/windows-arm](https://github.com/dockur/windows-arm/).
+> [!TIP]
+> To install ARM64 versions of Windows use [dockur/windows-arm](https://github.com/dockur/windows-arm/).
 
-* ### How do I select the Windows language?
+### How do I select the Windows language?
 
   By default, the English version of Windows will be downloaded. But you can add the `LANGUAGE` environment variable to your compose file, in order to specify an alternative language:
 
   ```yaml
   environment:
-    LANGUAGE: "Chinese"
+    LANGUAGE: "French"
   ```
+  
+  You can choose between: 🇦🇪 Arabic, 🇧🇬 Bulgarian, 🇨🇳 Chinese, 🇭🇷 Croatian, 🇨🇿 Czech, 🇩🇰 Danish, 🇳🇱 Dutch, 🇬🇧 English, 🇪🇪 Estionian, 🇫🇮 Finnish, 🇫🇷 French, 🇩🇪 German, 🇬🇷 Greek, 🇮🇱 Hebrew, 🇭🇺 Hungarian, 🇮🇹 Italian, 🇯🇵 Japanese, 🇰🇷 Korean, 🇱🇻 Latvian, 🇱🇹 Lithuanian, 🇳🇴 Norwegian, 🇵🇱 Polish, 🇵🇹 Portuguese, 🇷🇴 Romanian, 🇷🇺 Russian, 🇷🇸 Serbian, 🇸🇰 Slovak, 🇸🇮 Slovenian, 🇪🇸 Spanish, 🇸🇪 Swedish, 🇹🇭 Thai, 🇹🇷 Turkish and 🇺🇦 Ukrainian.
 
-  You can choose between `Arabic`, `Bulgarian`, `Chinese`, `Croatian`, `Czech`, `Danish`, `Dutch`, `Estonian`, `Finnish`, `French`, `German`, `Greek`, `Hebrew`, `Hungarian`, `Italian`, `Japanese`, `Korean`, `Latvian`, `Lithuanian`, `Norwegian`, `Polish`, `Portuguese`, `Romanian`, `Russian`, `Serbian`, `Slovak`, `Slovenian`, `Spanish`, `Swedish`, `Turkish`, `Thai` and `Ukrainian`.
+### How do I select the keyboard layout?
 
-  If you want to use a keyboard layout or locale that is not the default for the selected language, you can add the `KEYBOARD` and `REGION` variables with a culture code, like this:
+  If you want to use a keyboard layout or locale that is not the default for your selected language, you can add the `KEYBOARD` and `REGION` variables with a culture code, like this:
 
   ```yaml
   environment:
     REGION: "en-US"
     KEYBOARD: "en-US"
   ```
-  
-* ### How do I change the storage location?
+
+> [!NOTE]  
+>  Changing these values will have no effect after the installation has been performed already. Use the control panel inside Windows in that case.
+
+### How do I change the storage location?
 
   To change the storage location, include the following bind mount in your compose file:
 
@@ -139,7 +146,7 @@ kubectl apply -f kubernetes.yml
 
   Replace the example path `/var/win` with the desired storage folder.
 
-* ### How do I change the size of the disk?
+### How do I change the size of the disk?
 
   To expand the default size of 64 GB, add the `DISK_SIZE` setting to your compose file and set it to your preferred capacity:
 
@@ -148,9 +155,10 @@ kubectl apply -f kubernetes.yml
     DISK_SIZE: "256G"
   ```
   
-  This can also be used to resize the existing disk to a larger capacity without any data loss.
+> [!TIP]
+> This can also be used to resize the existing disk to a larger capacity without any data loss.
 
-* ### How do I share files with the host?
+### How do I share files with the host?
 
   Open 'File Explorer' and click on the 'Network' section, you will see a computer called `host.lan`. Double-click it and it will show a folder called `Data`, which can be binded to any folder on your host via the compose file:
 
@@ -159,9 +167,12 @@ kubectl apply -f kubernetes.yml
     -  /home/user/example:/shared
   ```
 
-  The example folder `/home/user/example` will be available as ` \\host.lan\Data`. You can optionally map this path to a drive letter in Windows, for easier access.
+  The example folder `/home/user/example` will be available as ` \\host.lan\Data`.
+  
+> [!TIP]
+> You can map this path to a drive letter in Windows, for easier access.
 
-* ### How do I install a custom image?
+### How do I install a custom image?
 
   In order to download an unsupported ISO image that is not selectable from the list above, specify the URL of that ISO in the `VERSION` environment variable, for example:
   
@@ -179,7 +190,7 @@ kubectl apply -f kubernetes.yml
 
   Replace the example path `/home/user/example.iso` with the filename of your desired ISO file, the value of `VERSION` will be ignored in this case.
 
-* ### How do I run a script after installation?
+### How do I run a script after installation?
 
   To run your own script after installation, you can create a file called `install.bat` and place it in a folder together with any additional files it needs (software to be installed for example). Then bind that folder in your compose file like this:
 
@@ -190,7 +201,7 @@ kubectl apply -f kubernetes.yml
 
   The example folder `/home/user/example` will be copied to `C:\OEM` during installation and the containing `install.bat` will be executed during the last step.
 
-* ### How do I perform a manual installation?
+### How do I perform a manual installation?
 
   It's best to stick to the automatic installation, as it adjusts various settings to prevent common issues when running Windows inside a virtual environment.
 
@@ -201,18 +212,7 @@ kubectl apply -f kubernetes.yml
     MANUAL: "Y"
   ```
 
-* ### How do I verify if my system supports KVM?
-
-  To verify if your system supports KVM, run the following commands:
-
-  ```bash
-  sudo apt install cpu-checker
-  sudo kvm-ok
-  ```
-
-  If you receive an error from `kvm-ok` indicating that KVM acceleration can't be used, check the virtualization settings in the BIOS.
-
-* ### How do I change the amount of CPU or RAM?
+### How do I change the amount of CPU or RAM?
 
   By default, the container will be allowed to use a maximum of 2 CPU cores and 4 GB of RAM.
 
@@ -224,7 +224,7 @@ kubectl apply -f kubernetes.yml
     CPU_CORES: "4"
   ```
 
-* ### How do I configure the username and password?
+### How do I configure the username and password?
 
   By default, a user called `Docker` is created during the installation, with an empty password.
 
@@ -236,7 +236,7 @@ kubectl apply -f kubernetes.yml
     PASSWORD: "gates"
   ```
 
-* ### How do I connect using RDP?
+### How do I connect using RDP?
 
   The web-viewer is mainly meant to be used during installation, as its picture quality is low, and it has no audio or clipboard for example.
 
@@ -244,7 +244,7 @@ kubectl apply -f kubernetes.yml
 
   There is a RDP client for [Android](https://play.google.com/store/apps/details?id=com.microsoft.rdc.androidx) available from the Play Store and one for [iOS](https://apps.apple.com/nl/app/microsoft-remote-desktop/id714464092?l=en-GB) in the Apple Store. For Linux you can use [FreeRDP](https://www.freerdp.com/) and on Windows just type `mstsc` in the search box.
 
-* ### How do I assign an individual IP address to the container?
+### How do I assign an individual IP address to the container?
 
   By default, the container uses bridge networking, which shares the IP address with the host. 
 
@@ -278,11 +278,12 @@ kubectl apply -f kubernetes.yml
  
   An added benefit of this approach is that you won't have to perform any port mapping anymore, since all ports will be exposed by default.
 
-  Please note that this IP address won't be accessible from the Docker host due to the design of macvlan, which doesn't permit communication between the two. If this is a concern, you need to create a [second macvlan](https://blog.oddbit.com/post/2018-03-12-using-docker-macvlan-networks/#host-access) as a workaround.
+> [!IMPORTANT]  
+> This IP address won't be accessible from the Docker host due to the design of macvlan, which doesn't permit communication between the two. If this is a concern, you need to create a [second macvlan](https://blog.oddbit.com/post/2018-03-12-using-docker-macvlan-networks/#host-access) as a workaround.
 
-* ### How can Windows acquire an IP address from my router?
+### How can Windows acquire an IP address from my router?
 
-  After configuring the container for macvlan (see above), it is possible for Windows to become part of your home network by requesting an IP from your router, just like a real PC.
+  After configuring the container for [macvlan](#how-do-i-assign-an-individual-ip-address-to-the-container), it is possible for Windows to become part of your home network by requesting an IP from your router, just like a real PC.
 
   To enable this mode, add the following lines to your compose file:
 
@@ -295,9 +296,10 @@ kubectl apply -f kubernetes.yml
     - 'c *:* rwm'
   ```
 
-  Please note that in this mode, the container and Windows will each have their own separate IPs. The container will keep the macvlan IP, and Windows will use the DHCP IP.
+> [!NOTE]  
+> In this mode, the container and Windows will each have their own separate IPs.
 
-* ### How do I add multiple disks?
+### How do I add multiple disks?
 
   To create additional disks, modify your compose file like this:
   
@@ -310,7 +312,7 @@ kubectl apply -f kubernetes.yml
     - /mnt/data/example:/storage3
   ```
 
-* ### How do I pass-through a disk?
+### How do I pass-through a disk?
 
   It is possible to pass-through disk devices directly by adding them to your compose file in this way:
 
@@ -320,9 +322,9 @@ kubectl apply -f kubernetes.yml
     - /dev/sdc:/disk2
   ```
 
-  Use `/disk1` if you want it to become your main drive, and use `/disk2` and higher to add them as secondary drives.
+  Use `/disk1` if you want it to become your main drive (which will be formatted during installation), and use `/disk2` and higher to add them as secondary drives (which will stay untouched).
 
-* ### How do I pass-through a USB device?
+### How do I pass-through a USB device?
 
   To pass-through a USB device, first lookup its vendor and product id via the `lsusb` command, then add them to your compose file like this:
 
@@ -333,22 +335,52 @@ kubectl apply -f kubernetes.yml
     - /dev/bus/usb
   ```
 
-* ### Is this project legal?
+> [!IMPORTANT]
+> If the device is a USB disk drive, please wait until after the installation is completed before connecting it. Otherwise the installation may fail, as the order of the disks can get rearranged.
 
-  Yes, this project contains only open-source code and does not distribute any copyrighted material. Any product keys found in the code are just generic placeholders provided by Microsoft for trial purposes. So under all applicable laws, this project would be considered legal.
+### How do I verify if my system supports KVM?
 
-## Stars
+  To verify that your system supports KVM, run the following commands:
+
+  ```bash
+  sudo apt install cpu-checker
+  sudo kvm-ok
+  ```
+
+  If you receive an error from `kvm-ok` indicating that KVM acceleration can't be used, please check whether:
+
+  - the virtualization extensions (`Intel VT-x` or `AMD SVM`) are enabled in your BIOS.
+
+  - you are running an operating system that supports them, like Linux or Windows 11 (macOS and Windows 10 do not unfortunately).
+
+  - you enabled "nested virtualization" if you are running the container inside a virtual machine.
+
+  - you are not using a cloud provider, as most of them do not allow nested virtualization for their VPS's.
+
+  If you didn't receive any error from `kvm-ok` at all, but the container still complains that `/dev/kvm` is missing, it might help to add `privileged: true` to your compose file (or `--privileged` to your `run` command), to rule out any permission issue.
+
+### How do I run macOS in a container?
+
+  You can use [dockur/macos](https://github.com/dockur/macos) for that. It shares many of the same features, except for the automatic installation.
+
+### Is this project legal?
+
+  Yes, this project contains only open-source code and does not distribute any copyrighted material. Any product keys found in the code are just generic placeholders provided by Microsoft for trial purposes. So under all applicable laws, this project will be considered legal.
+
+## Stars 🌟
 [![Stars](https://starchart.cc/dockur/windows.svg?variant=adaptive)](https://starchart.cc/dockur/windows)
 
-## Disclaimer
+## Disclaimer ⚖️
 
-The product names, logos, brands, and other trademarks referred to within this project are the property of their respective trademark holders. This project is not affiliated, sponsored, or endorsed by Microsoft Corporation.
+*The product names, logos, brands, and other trademarks referred to within this project are the property of their respective trademark holders. This project is not affiliated, sponsored, or endorsed by Microsoft Corporation.*
 
 [build_url]: https://github.com/dockur/windows/
 [hub_url]: https://hub.docker.com/r/dockurr/windows/
 [tag_url]: https://hub.docker.com/r/dockurr/windows/tags
+[pkg_url]: https://github.com/dockur/windows/pkgs/container/windows
 
 [Build]: https://github.com/dockur/windows/actions/workflows/build.yml/badge.svg
 [Size]: https://img.shields.io/docker/image-size/dockurr/windows/latest?color=066da5&label=size
 [Pulls]: https://img.shields.io/docker/pulls/dockurr/windows.svg?style=flat&label=pulls&logo=docker
 [Version]: https://img.shields.io/docker/v/dockurr/windows/latest?arch=amd64&sort=semver&color=066da5
+[Package]: https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fipitio.github.io%2Fbackage%2Fdockur%2Fwindows%2Fwindows.json&query=%24.downloads&logo=github&style=flat&color=066da5&label=pulls

src/entry.sh

@@ -23,13 +23,14 @@ cd /run
 
 trap - ERR
 
-info "Booting ${APP}${BOOT_DESC}..."
+version=$(qemu-system-x86_64 --version | head -n 1 | cut -d '(' -f 1 | awk '{ print $NF }')
+info "Booting ${APP}${BOOT_DESC} using QEMU v$version..."
 
 { qemu-system-x86_64 ${ARGS:+ $ARGS} >"$QEMU_OUT" 2>"$QEMU_LOG"; rc=$?; } || :
 (( rc != 0 )) && error "$(<"$QEMU_LOG")" && exit 15
 
 terminal
-( sleep 10; boot ) &
+( sleep 30; boot ) &
 tail -fn +0 "$QEMU_LOG" 2>/dev/null &
 cat "$QEMU_TERM" 2> /dev/null | tee "$QEMU_PTY" &
 wait $! || :

src/install.sh

@@ -119,10 +119,11 @@ finishInstall() {
   fi
 
   rm -f "$STORAGE/windows.old"
-  rm -f "$STORAGE/windows.type"
+  rm -f "$STORAGE/windows.vga"
   rm -f "$STORAGE/windows.base"
   rm -f "$STORAGE/windows.boot"
   rm -f "$STORAGE/windows.mode"
+  rm -f "$STORAGE/windows.type"
 
   cp -f /run/version "$STORAGE/windows.ver"
 
@@ -155,6 +156,10 @@ finishInstall() {
     fi
   fi
 
+  if [ -n "${VGA:-}" ] && [[ "${VGA:-}" != "virtio" ]] && [[ "${VGA:-}" != "ramfb" ]]; then
+    echo "$VGA" > "$STORAGE/windows.vga"
+  fi
+
   if [ -n "${DISK_TYPE:-}" ] && [[ "${DISK_TYPE:-}" != "scsi" ]]; then
     echo "$DISK_TYPE" > "$STORAGE/windows.type"
   fi
@@ -167,10 +172,13 @@ abortInstall() {
 
   local dir="$1"
   local iso="$2"
+  local efi
 
   [[ "${iso,,}" == *".esd" ]] && exit 60
 
-  if [ ! -d "$dir/EFI" ]; then
+  efi=$(find "$dir" -maxdepth 1 -type d -iname efi | head -n 1)
+
+  if [ -z "$efi" ]; then
     [[ "${PLATFORM,,}" == "x64" ]] && BOOT_MODE="windows_legacy"
   fi
 
@@ -489,19 +497,6 @@ setXML() {
   return 0
 }
 
-skipVersion() {
-
-  local version="$1"
-
-  case "${version,,}" in
-    "win2k"* | "winxp"* | "win9"* )
-      return 0
-      ;;
-  esac
-
-  return 1
-}
-
 detectImage() {
 
   local dir="$1"
@@ -528,7 +523,12 @@ detectImage() {
   fi
 
   info "Detecting version from ISO image..."
-  detectLegacy "$dir" && return 0
+
+  if detectLegacy "$dir"; then
+    desc=$(printEdition "$DETECTED" "$DETECTED")
+    info "Detected: $desc"
+    return 0
+  fi
 
   local src wim info
   src=$(find "$dir" -maxdepth 1 -type d -iname sources | head -n 1)
@@ -565,7 +565,7 @@ detectImage() {
 
   if [[ "${LANGUAGE,,}" != "en" ]] && [[ "${LANGUAGE,,}" != "en-"* ]]; then
     language=$(getLanguage "$LANGUAGE" "desc")
-    desc="$desc ($language)"
+    desc=+" ($language)"
   fi
 
   info "Detected: $desc"
@@ -588,37 +588,12 @@ prepareImage() {
 
   local iso="$1"
   local dir="$2"
-  local missing
+  local desc missing
 
-  case "${DETECTED,,}" in
-    "win9"* | "win2k"* )
-      MACHINE="pc-i440fx-2.4" ;;
-    "winxp"* | "winvistax86"* |  "win7x86"* )
-      MACHINE="pc-q35-2.10" ;;
-  esac
+  desc=$(printVersion "$DETECTED" "$DETECTED")
 
-  case "${DETECTED,,}" in
-    "win9"* | "winxp"* | "win2k"* )
-      HV="N"
-      BOOT_MODE="windows_legacy" ;;
-    "winvista"* | "win7"* | "win2008"* )
-      BOOT_MODE="windows_legacy" ;;
-  esac
-
-  case "${DETECTED,,}" in
-    "winxp"* )
-      DISK_TYPE="blk"
-      prepareXP "$iso" "$dir" && return 0
-      error "Failed to prepare Windows XP ISO!" && return 1 ;;
-    "win9"* )
-      DISK_TYPE="auto"
-      prepare9x "$iso" "$dir" && return 0
-      error "Failed to prepare Windows 9x ISO!" && return 1 ;;
-    "win2k"* )
-      DISK_TYPE="auto"
-      prepare2k "$iso" "$dir" && return 0
-      error "Failed to prepare Windows 2000 ISO!" && return 1 ;;
-  esac
+  ! setMachine "$DETECTED" "$iso" "$dir" "$desc" && return 1
+  skipVersion "$DETECTED" && return 0
 
   if [[ "${BOOT_MODE,,}" != "windows_legacy" ]]; then
 
@@ -627,13 +602,13 @@ prepareImage() {
     missing=$(basename "$dir/$EFISYS")
     [ ! -f "$dir/$ETFS" ] && missing=$(basename "$dir/$ETFS")
 
-    error "failed to locate file '${missing,,}' in ISO image!"
+    error "Failed to locate file \"${missing,,}\" in ISO image!"
     return 1
   fi
 
-  prepareLegacy "$iso" "$dir" && return 0
+  prepareLegacy "$iso" "$dir" "$desc" && return 0
 
-  error "Failed to extract boot image from ISO!"
+  error "Failed to extract boot image from ISO image!"
   return 1
 }
 
@@ -643,6 +618,12 @@ updateXML() {
   local language="$2"
   local culture region user admin pass keyboard
 
+  [ -z "$YRES" ] && YRES="720"
+  [ -z "$XRES" ] && XRES="1280"
+
+  sed -i "s/<VerticalResolution>1080<\/VerticalResolution>/<VerticalResolution>$YRES<\/VerticalResolution>/g" "$asset"
+  sed -i "s/<HorizontalResolution>1920<\/HorizontalResolution>/<HorizontalResolution>$XRES<\/HorizontalResolution>/g" "$asset"
+
   culture=$(getLanguage "$language" "culture")
 
   if [ -n "$culture" ] && [[ "${culture,,}" != "en-us" ]]; then
@@ -699,14 +680,14 @@ addDriver() {
   case "${id,,}" in
     "win7x86"* ) folder="w7/x86" ;;
     "win7x64"* ) folder="w7/amd64" ;;
-    "win81x64"* ) folder="w10/amd64" ;;
+    "win81x64"* ) folder="w8.1/amd64" ;;
     "win10x64"* ) folder="w10/amd64" ;;
     "win11x64"* ) folder="w11/amd64" ;;
-    "win2025"* ) folder="2k22/amd64" ;;    
+    "win2025"* ) folder="2k25/amd64" ;;
     "win2022"* ) folder="2k22/amd64" ;;
     "win2019"* ) folder="2k19/amd64" ;;
     "win2016"* ) folder="2k16/amd64" ;;
-    "win2012"* ) folder="2k16/amd64" ;;
+    "win2012"* ) folder="2k12R2/amd64" ;;
     "win2008"* ) folder="2k8R2/amd64" ;;
     "win10arm64"* ) folder="w10/ARM64" ;;
     "win11arm64"* ) folder="w11/ARM64" ;;
@@ -720,9 +701,11 @@ addDriver() {
 
   [ ! -d "$path/$driver/$folder" ] && return 0
 
-  if [[ "${id,,}" == "winvista"* ]]; then
-    [[ "${driver,,}" == "viorng" ]] && return 0
-  fi
+  case "${id,,}" in
+    "winvista"* )
+      [[ "${driver,,}" == "viorng" ]] && return 0
+      ;;
+  esac
 
   local dest="$path/$target/$driver"
   mv "$path/$driver/$folder" "$dest"
@@ -943,6 +926,12 @@ buildImage() {
   local msg="Building $desc image..."
   info "$msg" && html "$msg"
 
+  [ -z "$LABEL" ] && LABEL="Windows"
+
+  if [ ! -f "$dir/$ETFS" ]; then
+    error "Failed to locate file \"$ETFS\" in ISO image!" && return 1
+  fi
+
   size=$(du -h -b --max-depth=0 "$dir" | cut -f1)
   size_gb=$(( (size + 1073741823)/1073741824 ))
   space=$(df --output=avail -B 1 "$TMP" | tail -n 1)
@@ -952,8 +941,6 @@ buildImage() {
     error "Not enough free space in $STORAGE, have $space_gb GB available but need at least $size_gb GB." && return 1
   fi
 
-  [ -z "$LABEL" ] && LABEL="Windows"
-
   if [[ "${BOOT_MODE,,}" != "windows_legacy" ]]; then
 
     ! genisoimage -o "$out" -b "$ETFS" -no-emul-boot -c "$cat" -iso-level 4 -J -l -D -N -joliet-long -relaxed-filenames -V "${LABEL::30}" \
@@ -962,7 +949,7 @@ buildImage() {
   else
 
     case "${DETECTED,,}" in
-      "win2k"* | "winxp"* )
+      "win2k"* | "winxp"* | "win2003"* )
         ! genisoimage -o "$out" -b "$ETFS" -no-emul-boot -boot-load-seg 1984 -boot-load-size 4 -c "$cat" -iso-level 2 -J -l -D -N -joliet-long \
                       -relaxed-filenames -V "${LABEL::30}" -quiet "$dir" 2> "$log" && failed="y" ;;
       "win9"* )
@@ -993,10 +980,14 @@ bootWindows() {
 
   rm -rf "$TMP"
 
-  [[ "${PLATFORM,,}" == "arm64" ]] && VGA="virtio-gpu"
+  if [ -s "$STORAGE/windows.vga" ] && [ -f "$STORAGE/windows.vga" ]; then
+    [ -z "${VGA:-}" ] && VGA=$(<"$STORAGE/windows.vga")
+  else
+    [ -z "${VGA:-}" ] && [[ "${PLATFORM,,}" == "arm64" ]] && VGA="virtio-gpu"
+  fi
 
   if [ -s "$STORAGE/windows.type" ] && [ -f "$STORAGE/windows.type" ]; then
-    DISK_TYPE=$(<"$STORAGE/windows.type")
+    [ -z "${DISK_TYPE:-}" ] && DISK_TYPE=$(<"$STORAGE/windows.type")
   fi
 
   if [ -s "$STORAGE/windows.mode" ] && [ -f "$STORAGE/windows.mode" ]; then

src/mido.sh

@@ -85,7 +85,7 @@ download_windows() {
 
   local url="https://www.microsoft.com/en-us/software-download/windows$windows_version"
   case "$windows_version" in
-    8 | 10) url="${url}ISO";;
+    8 | 10) url+="ISO";;
   esac
 
   # uuidgen: For MacOS (installed by default) and other systems (e.g. with no /proc) that don't have a kernel interface for generating random UUIDs
@@ -191,10 +191,10 @@ download_windows_eval() {
       windows_version="windows-11-enterprise" ;;
     "win11${PLATFORM,,}-enterprise-iot-eval" )
       enterprise_type="iot"
-      windows_version="windows-11-iot-enterprise-ltsc" ;;
+      windows_version="windows-11-iot-enterprise-ltsc-eval" ;;
     "win11${PLATFORM,,}-enterprise-ltsc-eval" )
       enterprise_type="iot"
-      windows_version="windows-11-iot-enterprise-ltsc" ;;
+      windows_version="windows-11-iot-enterprise-ltsc-eval" ;;
     "win10${PLATFORM,,}-enterprise-eval" )
       enterprise_type="enterprise"
       windows_version="windows-10-enterprise" ;;
@@ -318,6 +318,7 @@ getWindows() {
 
   case "${version,,}" in
     "win11${PLATFORM,,}-enterprise-iot-eval" ) ;;
+    "win11${PLATFORM,,}-enterprise-ltsc-eval" ) ;;
     * )
       if [[ "${PLATFORM,,}" != "x64" ]]; then
         error "No download for the ${PLATFORM^^} platform available for $edition!"
@@ -416,8 +417,12 @@ getESD() {
   local fFile="products_filter.xml"
 
   { wget "$winCatalog" -O "$dir/$wFile" -q --timeout=30; rc=$?; } || :
-  (( rc == 4 )) && error "Failed to download $winCatalog , network failure!" && return 1
-  (( rc != 0 )) && error "Failed to download $winCatalog , reason: $rc" && return 1
+
+  msg="Failed to download $winCatalog"
+  (( rc == 3 )) && error "$msg , cannot write file (disk full?)" && return 1
+  (( rc == 4 )) && error "$msg , network failure!" && return 1
+  (( rc == 8 )) && error "$msg , server issued an error response!" && return 1
+  (( rc != 0 )) && error "$msg , reason: $rc" && return 1
 
   cd "$dir"
 
@@ -495,8 +500,6 @@ verifyFile() {
   fi
 
   error "The downloaded file has an invalid $algo checksum: $hash , while expected value was: $check. Please report this at $SUPPORT/issues"
-
-  rm -f "$iso"
   return 1
 }
 
@@ -508,10 +511,16 @@ downloadFile() {
   local size="$4"
   local lang="$5"
   local desc="$6"
-  local rc total progress domain dots
+  local rc total progress domain dots space folder
 
   rm -f "$iso"
 
+  if [ -n "$size" ] && [[ "$size" != "0" ]]; then
+    folder=$(dirname -- "$iso")
+    space=$(df --output=avail -B 1 "$folder" | tail -n 1)
+    (( size > space )) && error "Not enough free space left to download file!" && return 1
+  fi
+
   # Check if running with interactive TTY or redirected to docker log
   if [ -t 1 ]; then
     progress="--progress=bar:noscroll"
@@ -519,19 +528,19 @@ downloadFile() {
     progress="--progress=dot:giga"
   fi
 
-  local msg="Downloading $desc..."
-  html "$msg"
+  local msg="Downloading $desc"
+  html "$msg..."
 
   domain=$(echo "$url" | awk -F/ '{print $3}')
   dots=$(echo "$domain" | tr -cd '.' | wc -c)
   (( dots > 1 )) && domain=$(expr "$domain" : '.*\.\(.*\..*\)')
 
   if [ -n "$domain" ] && [[ "${domain,,}" != *"microsoft.com" ]]; then
-    msg="Downloading $desc from $domain..."
+    msg="Downloading $desc from $domain"
   fi
 
-  info "$msg"
-  /run/progress.sh "$iso" "$size" "Downloading $desc ([P])..." &
+  info "$msg..."
+  /run/progress.sh "$iso" "$size" "$msg ([P])..." &
 
   { wget "$url" -O "$iso" -q --timeout=30 --show-progress "$progress"; rc=$?; } || :
 
@@ -539,19 +548,19 @@ downloadFile() {
 
   if (( rc == 0 )) && [ -f "$iso" ]; then
     total=$(stat -c%s "$iso")
-    if [ "$total" -gt 100000000 ]; then
-      ! verifyFile "$iso" "$size" "$total" "$sum" && return 1
-      html "Download finished successfully..." && return 0
+    if [ "$total" -lt 100000000 ]; then
+      error "Invalid download link: $url (is only $total bytes?). Please report this at $SUPPORT/issues." && return 1
     fi
+    ! verifyFile "$iso" "$size" "$total" "$sum" && return 1
+    html "Download finished successfully..." && return 0
   fi
 
-  if (( rc != 4 )); then
-    error "Failed to download $url , reason: $rc"
-  else
-    error "Failed to download $url , network failure!"
-  fi
+  msg="Failed to download $url"
+  (( rc == 3 )) && error "$msg , cannot write file (disk full?)" && return 1
+  (( rc == 4 )) && error "$msg , network failure!" && return 1
+  (( rc == 8 )) && error "$msg , server issued an error response!" && return 1
 
-  rm -f "$iso"
+  error "$msg , reason: $rc"
   return 1
 }
 
@@ -567,6 +576,7 @@ downloadImage() {
     base=$(basename "$iso")
     desc=$(fromFile "$base")
     downloadFile "$iso" "$version" "" "" "" "$desc" && return 0
+    rm -f "$iso"
     return 1
   fi
 
@@ -582,7 +592,7 @@ downloadImage() {
       desc=$(printEdition "$version" "$desc")
       error "The $language language version of $desc is not available, please switch to English." && return 1
     fi
-    desc="$desc in $language"
+    desc+=" in $language"
   fi
 
   if isMido "$version" "$lang"; then
@@ -591,6 +601,7 @@ downloadImage() {
       size=$(getMido "$version" "$lang" "size" )
       sum=$(getMido "$version" "$lang" "sum")
       downloadFile "$iso" "$MIDO_URL" "$sum" "$size" "$lang" "$desc" && return 0
+      rm -f "$iso"
     fi
   fi
 
@@ -607,6 +618,7 @@ downloadImage() {
     if getESD "$TMP/esd" "$version" "$lang" "$desc"; then
       ISO="${ISO%.*}.esd"
       downloadFile "$ISO" "$ESD" "$ESD_SUM" "$ESD_SIZE" "$lang" "$desc" && return 0
+      rm -f "$ISO"
       ISO="$iso"
     fi
 
@@ -624,6 +636,7 @@ downloadImage() {
       size=$(getSize "$i" "$version" "$lang")
       sum=$(getHash "$i" "$version" "$lang")
       downloadFile "$iso" "$url" "$sum" "$size" "$lang" "$desc" && return 0
+      rm -f "$iso"
     fi
 
   done

src/power.sh

@@ -216,7 +216,7 @@ _graceful_shutdown() {
 
 SERIAL="pty"
 MONITOR="telnet:localhost:$QEMU_PORT,server,nowait,nodelay"
-MONITOR="$MONITOR -daemonize -D $QEMU_LOG -pidfile $QEMU_PID"
+MONITOR+=" -daemonize -D $QEMU_LOG -pidfile $QEMU_PID"
 
 _trap _graceful_shutdown SIGTERM SIGHUP SIGINT SIGABRT SIGQUIT
 

src/samba.sh

@@ -3,8 +3,8 @@ set -Eeuo pipefail
 
 : "${SAMBA:="Y"}"
 
-[[ "$SAMBA" != [Yy1]* ]] && return 0
-[[ "$NETWORK" != [Yy1]* ]] && return 0
+[[ "$SAMBA" == [Nn]* ]] && return 0
+[[ "$NETWORK" == [Nn]* ]] && return 0
 
 hostname="host.lan"
 interface="dockerbridge"
@@ -21,7 +21,32 @@ if [ ! -d "$share" ] && [ -d "$STORAGE/shared" ]; then
 fi
 
 mkdir -p "$share"
-[ -z "$(ls -A "$share")" ] && chmod 777 "$share"
+
+if [ -z "$(ls -A "$share")" ]; then
+
+  chmod 777 "$share"
+
+  {      echo "--------------------------------------------------------"
+          echo " $APP for Docker v$(</run/version)..."
+          echo " For support visit $SUPPORT"
+          echo "--------------------------------------------------------"
+          echo ""
+          echo "Using this folder you can share files with the host machine."
+          echo ""
+          echo "To change its location, include the following bind mount in your compose file:"
+          echo ""
+          echo "  volumes:"
+          echo "    - \"/home/user/example:/shared\""
+          echo ""
+          echo "Or in your run command:"
+          echo ""
+          echo "  -v \"/home/user/example:/shared\""
+          echo ""
+          echo "Replace the example path /home/user/example with the desired shared folder."
+          echo ""
+  } | unix2dos > "$share/readme.txt"
+
+fi
 
 {      echo "[global]"
         echo "    server string = Dockur"
@@ -50,41 +75,27 @@ mkdir -p "$share"
         echo "    force group = root"
 } > "/etc/samba/smb.conf"
 
-{      echo "--------------------------------------------------------"
-        echo " $APP for Docker v$(</run/version)..."
-        echo " For support visit $SUPPORT"
-        echo "--------------------------------------------------------"
-        echo ""
-        echo "Using this folder you can share files with the host machine."
-        echo ""
-        echo "To change its location, include the following bind mount in your compose file:"
-        echo ""
-        echo "  volumes:"
-        echo "    - \"/home/user/example:/shared\""
-        echo ""
-        echo "Or in your run command:"
-        echo ""
-        echo "  -v \"/home/user/example:/shared\""
-        echo ""
-        echo "Replace the example path /home/user/example with the desired shared folder."
-        echo ""
-} | unix2dos > "$share/readme.txt"
+if ! smbd; then
+  error "Samba daemon failed to start!"
+  smbd -i --debug-stdout || true
+fi
 
-! smbd && smbd --debug-stdout
-
-legacy="N"
+legacy=""
 
 if [ -f "$STORAGE/windows.old" ]; then
   MT=$(<"$STORAGE/windows.old")
-  [[ "${MT,,}" == "pc-q35-2"* ]] && legacy="Y"
+  [[ "${MT,,}" == "pc-q35-2"* ]] && legacy="y"
+  [[ "${MT,,}" == "pc-i440fx-2"* ]] && legacy="y"
 fi
 
-if [[ "$legacy" == [Yy1]* ]]; then
-  [[ "$DHCP" == [Yy1]* ]] && return 0
-  # Enable NetBIOS on Windows XP
-  ! nmbd && nmbd --debug-stdout
+if [ -n "$legacy" ]; then
+  # Enable NetBIOS on Windows XP and lower
+  if ! nmbd; then
+    error "NetBIOS daemon failed to start!"
+    nmbd -i --debug-stdout || true
+  fi
 else
-  # Enable Web Service Discovery
+  # Enable Web Service Discovery on Vista and up
   wsdd -i "$interface" -p -n "$hostname" &
   echo "$!" > /var/run/wsdd.pid
 fi