Unverified Commit 06722236 authored by Kroese's avatar Kroese Committed by GitHub
Browse files

feat: Improved installation (#39)

parent 27bb0724

Dockerfile

+3 −3
Original line number Diff line number Diff line
@@ -19,15 +19,15 @@ COPY ./src /run/ 
COPY ./assets /run/assets



ADD https://raw.githubusercontent.com/ElliotKillick/Mido/main/Mido.sh /run/mido.sh

ADD https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso /run/drivers.iso

ADD https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/latest-virtio/virtio-win.iso /run/drivers.iso



RUN chmod +x /run/*.sh



EXPOSE 8006

EXPOSE 3389 8006

VOLUME /storage



ENV CPU_CORES "2"

ENV RAM_SIZE "4G"

ENV CPU_CORES "2"

ENV DISK_SIZE "64G"



ARG VERSION_ARG "0.0"

assets/win7x64-ultimate.xml

deleted100644 → 0
+0 −202
Original line number Diff line number Diff line 
<?xml version="1.0"?>

<unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State">

  <settings pass="offlineServicing"/>

  <settings pass="windowsPE">

    <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">

      <SetupUILanguage>

        <UILanguage>en-US</UILanguage>

      </SetupUILanguage>

      <InputLocale>0409:00000409</InputLocale>

      <SystemLocale>en-US</SystemLocale>

      <UILanguage>en-US</UILanguage>

      <UserLocale>en-US</UserLocale>

    </component>

    <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">

      <DiskConfiguration>

        <Disk wcm:action="add">

          <DiskID>0</DiskID>

          <WillWipeDisk>true</WillWipeDisk>

          <CreatePartitions>

            <!-- Windows RE Tools partition -->

            <CreatePartition wcm:action="add">

              <Order>1</Order>

              <Type>Primary</Type>

              <Size>300</Size>

            </CreatePartition>

            <!-- System partition (ESP) -->

            <CreatePartition wcm:action="add">

              <Order>2</Order>

              <Type>EFI</Type>

              <Size>100</Size>

            </CreatePartition>

            <!-- Microsoft reserved partition (MSR) -->

            <CreatePartition wcm:action="add">

              <Order>3</Order>

              <Type>MSR</Type>

              <Size>128</Size>

            </CreatePartition>

            <!-- Windows partition -->

            <CreatePartition wcm:action="add">

              <Order>4</Order>

              <Type>Primary</Type>

              <Extend>true</Extend>

            </CreatePartition>

          </CreatePartitions>

          <ModifyPartitions>

            <!-- Windows RE Tools partition -->

            <ModifyPartition wcm:action="add">

              <Order>1</Order>

              <PartitionID>1</PartitionID>

              <Label>WINRE</Label>

              <Format>NTFS</Format>

              <TypeID>DE94BBA4-06D1-4D40-A16A-BFD50179D6AC</TypeID>

            </ModifyPartition>

            <!-- System partition (ESP) -->

            <ModifyPartition wcm:action="add">

              <Order>2</Order>

              <PartitionID>2</PartitionID>

              <Label>System</Label>

              <Format>FAT32</Format>

            </ModifyPartition>

            <!-- MSR partition does not need to be modified -->

            <ModifyPartition wcm:action="add">

              <Order>3</Order>

              <PartitionID>3</PartitionID>

            </ModifyPartition>

            <!-- Windows partition -->

            <ModifyPartition wcm:action="add">

              <Order>4</Order>

              <PartitionID>4</PartitionID>

              <Label>Windows</Label>

              <Letter>C</Letter>

              <Format>NTFS</Format>

            </ModifyPartition>

          </ModifyPartitions>

        </Disk>

      </DiskConfiguration>

      <ImageInstall>

        <OSImage>

          <InstallTo>

            <DiskID>0</DiskID>

            <PartitionID>4</PartitionID>

          </InstallTo>

          <InstallToAvailablePartition>false</InstallToAvailablePartition>

        </OSImage>

      </ImageInstall>

      <UserData>

        <ProductKey>

          <Key>FJ82H-XT6CR-J8D7P-XQJJ2-GPDD4</Key>

          <WillShowUI>Never</WillShowUI>

        </ProductKey>

        <AcceptEula>true</AcceptEula>

        <FullName>Docker</FullName>

        <Organization/>

      </UserData>

      <EnableFirewall>false</EnableFirewall>

    </component>

    <component name="Microsoft-Windows-PnpCustomizationsWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">

      <DriverPaths>

        <PathAndCredentials wcm:action="add" wcm:keyValue="1">

          <Path>D:\viostor\w7\amd64</Path>

        </PathAndCredentials>

        <PathAndCredentials wcm:action="add" wcm:keyValue="2">

          <Path>D:\NetKVM\w7\amd64</Path>

        </PathAndCredentials>

        <PathAndCredentials wcm:action="add" wcm:keyValue="3">

          <Path>D:\Balloon\w7\amd64</Path>

        </PathAndCredentials>

        <PathAndCredentials wcm:action="add" wcm:keyValue="4">

          <Path>D:\pvpanic\w7\amd64</Path>

        </PathAndCredentials>

        <PathAndCredentials wcm:action="add" wcm:keyValue="5">

          <Path>D:\qemupciserial\w7\amd64</Path>

        </PathAndCredentials>

        <PathAndCredentials wcm:action="add" wcm:keyValue="6">

          <Path>D:\qxldod\w7\amd64</Path>

        </PathAndCredentials>

        <PathAndCredentials wcm:action="add" wcm:keyValue="7">

          <Path>D:\vioinput\w7\amd64</Path>

        </PathAndCredentials>

        <PathAndCredentials wcm:action="add" wcm:keyValue="8">

          <Path>D:\viorng\w7\amd64</Path>

        </PathAndCredentials>

        <PathAndCredentials wcm:action="add" wcm:keyValue="9">

          <Path>D:\vioscsi\w7\amd64</Path>

        </PathAndCredentials>

        <PathAndCredentials wcm:action="add" wcm:keyValue="10">

          <Path>D:\vioserial\w7\amd64</Path>

        </PathAndCredentials>

      </DriverPaths>

    </component>

  </settings>

  <settings pass="specialize">

    <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">

      <InputLocale>0409:00000409</InputLocale>

      <SystemLocale>en-US</SystemLocale>

      <UILanguage>en-US</UILanguage>

      <UserLocale>en-US</UserLocale>

    </component>

    <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">

      <SkipAutoActivation>true</SkipAutoActivation>

    </component>

    <component name="Microsoft-Windows-SQMApi" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">

      <CEIPEnabled>0</CEIPEnabled>

    </component>

  </settings>

  <settings pass="oobeSystem">

    <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">

      <UserAccounts>

        <LocalAccounts>

          <LocalAccount wcm:action="add">

            <Name>Docker</Name>

            <Group>Administrators</Group>

            <Password>

              <Value/>

              <PlainText>true</PlainText>

            </Password>

          </LocalAccount>

        </LocalAccounts>

        <AdministratorPassword>

          <Value>password</Value>

          <PlainText>true</PlainText>

        </AdministratorPassword>

      </UserAccounts>

      <AutoLogon>

        <Username>Docker</Username>

        <Enabled>true</Enabled>

        <LogonCount>1</LogonCount>

        <Password>

          <Value/>

          <PlainText>true</PlainText>

        </Password>

      </AutoLogon>

      <OOBE>

        <HideEULAPage>true</HideEULAPage>

        <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen>

        <HideOnlineAccountScreens>true</HideOnlineAccountScreens>

        <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE>

        <NetworkLocation>Home</NetworkLocation>

        <ProtectYourPC>1</ProtectYourPC>

        <SkipUserOOBE>true</SkipUserOOBE>

        <SkipMachineOOBE>true</SkipMachineOOBE>

      </OOBE>

      <FirstLogonCommands>

        <SynchronousCommand wcm:action="add">

          <Order>1</Order>

          <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /v AutoLogonCount /t REG_DWORD /d 0 /f</CommandLine>

        </SynchronousCommand>

        <SynchronousCommand wcm:action="add">

          <Order>2</Order>

          <RequiresUserInput>false</RequiresUserInput>

          <CommandLine>cmd /C wmic useraccount where name="Docker" set PasswordExpires=false</CommandLine>

          <Description>Password Never Expires</Description>

        </SynchronousCommand>

        <SynchronousCommand wcm:action="add">

          <Order>3</Order>

          <CommandLine>msiexec /i E:\virtio-win-gt-x64.msi /qb!</CommandLine>

          <Description>Install VirtIO drivers</Description>

        </SynchronousCommand>

      </FirstLogonCommands>

    </component>

  </settings>

</unattend>

assets/win81x64.xml

+15 −11
Original line number Diff line number Diff line 
<?xml version="1.0"?>

<unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State">

  <settings pass="offlineServicing"/>

  <settings pass="windowsPE">

    <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">

      <SetupUILanguage>
@@ -76,6 +75,12 @@ 
      </DiskConfiguration>

      <ImageInstall>

        <OSImage>

          <InstallFrom>

            <MetaData wcm:action="add">

              <Value>Windows 8.1 Pro</Value>

              <Key>/IMAGE/NAME</Key>

            </MetaData>

          </InstallFrom>

          <InstallTo>

            <DiskID>0</DiskID>

            <PartitionID>4</PartitionID>
@@ -86,18 +91,18 @@ 
      <UserData>

        <ProductKey>

          <Key>GCRJD-8NW9H-F2CDX-CCM8D-9D6T9</Key>

          <WillShowUI>Never</WillShowUI>

          <WillShowUI>OnError</WillShowUI>

        </ProductKey>

        <AcceptEula>true</AcceptEula>

        <FullName>Docker</FullName>

        <Organization/>

        <Organization>Docker</Organization>

      </UserData>

      <EnableFirewall>false</EnableFirewall>

    </component>

    <component name="Microsoft-Windows-PnpCustomizationsWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">

      <DriverPaths>

        <PathAndCredentials wcm:action="add" wcm:keyValue="1">

          <Path>D:\viostor\w8.1\amd64</Path>

          <Path>D:\viostor\w10\amd64</Path>

        </PathAndCredentials>

        <PathAndCredentials wcm:action="add" wcm:keyValue="2">

          <Path>D:\NetKVM\w8.1\amd64</Path>
@@ -121,7 +126,7 @@ 
          <Path>D:\viorng\w8.1\amd64</Path>

        </PathAndCredentials>

        <PathAndCredentials wcm:action="add" wcm:keyValue="9">

          <Path>D:\vioscsi\w8.1\amd64</Path>

          <Path>D:\vioscsi\w10\amd64</Path>

        </PathAndCredentials>

        <PathAndCredentials wcm:action="add" wcm:keyValue="10">

          <Path>D:\vioserial\w8.1\amd64</Path>
@@ -129,6 +134,11 @@ 
      </DriverPaths>

    </component>

  </settings>

  <settings pass="offlineServicing">

    <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">

      <EnableLUA>false</EnableLUA>

    </component>

  </settings>

  <settings pass="specialize">

    <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">

      <InputLocale>0409:00000409</InputLocale>
@@ -187,12 +197,6 @@ 
        </SynchronousCommand>

        <SynchronousCommand wcm:action="add">

          <Order>2</Order>

          <RequiresUserInput>false</RequiresUserInput>

          <CommandLine>cmd /C wmic useraccount where name="Docker" set PasswordExpires=false</CommandLine>

          <Description>Password Never Expires</Description>

        </SynchronousCommand>

        <SynchronousCommand wcm:action="add">

          <Order>3</Order>

          <CommandLine>msiexec /i E:\virtio-win-gt-x64.msi /qb!</CommandLine>

          <Description>Install VirtIO drivers</Description>

        </SynchronousCommand>

docker-compose.yml

+2 −2
Original line number Diff line number Diff line
@@ -3,13 +3,13 @@ services: 
  windows:

    image: dockurr/windows

    container_name: windows

    environment:

      VERSION: "win11x64"

    devices:

      - /dev/kvm

    cap_add:

      - NET_ADMIN

    ports:

      - 8006:8006

      - 3389:3389/tcp

      - 3389:3389/udp

    stop_grace_period: 2m

    restart: unless-stopped

readme.md

+31 −26
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ services: 
      - NET_ADMIN

    ports:

      - 8006:8006

      - 3389:3389/tcp

      - 3389:3389/udp

    stop_grace_period: 2m

    restart: unless-stopped

```
@@ -52,37 +54,31 @@ docker run -it --rm -p 8006:8006 --device=/dev/kvm --cap-add NET_ADMIN dockurr/w 


    Very simple! These are the steps:

    

    - Start the container and get some coffee, it will begin downloading the ISO file.

    - Start the container and get some coffee.



    - Connect to port 8006 of the container in your web browser and wait until you see the screen.

    - Connect to port 8006 of the container in your web browser.



    - Sit back and relax while the magic happens, the whole installation will be performed fully automatic.



    - Once you see the desktop, your Windows installation is ready for use. Enjoy it, and don't forget to star this repo!



  * ### How do I specify another 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 download:



    ```yaml

    environment:

      VERSION: "win11x64"

      VERSION: "win11"

    ```

    

    Select from the values below:

    

    - ```win11x64``` (Windows 11)

    - ```win10x64``` (Windows 10)

    - ```win81x64``` (Windows 8.1)

    - ```win2022-eval``` (Windows Server 2022)

    - ```win2019-eval``` (Windows Server 2019)

    - ```win2016-eval``` (Windows Server 2016)



  * ### How do I install a custom ISO file?



    You can supply your own ISO file by naming it ```custom.iso``` and placing it in the ```/storage``` folder.



    Make sure to delete any other files in this folder, so that there are no leftovers from previous installations. Then follow the same steps as for [manual installation](https://github.com/dockur/windows/tree/master?tab=readme-ov-file#how-do-i-perform-a-manual-installation).

    - ```win11``` (Windows 11)

    - ```win10``` (Windows 10)

    - ```win81``` (Windows 8.1)

    - ```win22``` (Windows Server 2022)

    - ```win19``` (Windows Server 2019)

    - ```win16``` (Windows Server 2016)



  * ### How do I increase the amount of CPU or RAM?
@@ -96,20 +92,20 @@ docker run -it --rm -p 8006:8006 --device=/dev/kvm --cap-add NET_ADMIN dockurr/w 
      CPU_CORES: "4"

    ```



  * ### How do I change the size of the data 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:



    ```yaml

    environment:

      DISK_SIZE: "128G"

      DISK_SIZE: "256G"

    ```

    

    This can also be used to resize the existing disk to a larger capacity without any data loss.

    

  * ### How do I change the location of the data disk?

  * ### How do I change the storage location?



    To change the location of the data disk, include the following bind mount in your compose file:

    To change the storage location, include the following bind mount in your compose file:



    ```yaml

    volumes:
@@ -131,24 +127,22 @@ docker run -it --rm -p 8006:8006 --device=/dev/kvm --cap-add NET_ADMIN dockurr/w 


  * ### How do I view the screen?



    The container includes a web-based viewer, so you can visit [http://localhost:8006/](http://localhost:8006/) using any web browser to view the screen and interact with Windows via the keyboard or mouse.

    The container includes a web-based viewer, so you can visit [http://localhost:8006/](http://localhost:8006/) using any web browser to view the screen and interact with Windows via the keyboard and mouse.



    This is mainly for use during installation, as afterwards you can use Remote Desktop, TeamViewer or any other software you prefer.



  * ### How do I perform a manual installation?



    If you prefer to perform the installation manually in order to customize some options, add the following environment variable:

    If you prefer to perform the installation manually in order to customize some options, such as selecting another edition, add the following environment variable:



    ```yaml

    environment:

      ATTENDED: "Y"

      MANUAL: "Y"

    ```



    Then follow these steps:



    - Start the container and wait until the ISO download is finished. If needed, you can view the progress in the Docker log.



    - Connect to port 8006 of the container in your web browser, you will see the Windows installation screen.

    - Start the container and connect to port 8006 of the container in your web browser. After the download is finished, you will see the Windows installation screen.



    - Start the installation by clicking ```Install now```. On the next screen, press 'OK' when prompted to ```Load driver``` and select the ```VirtIO SCSI``` driver from the list that matches your Windows version. So for Windows 11, select ```D:\amd64\w11\vioscsi.inf``` and click 'Next'.
@@ -164,6 +158,17 @@ docker run -it --rm -p 8006:8006 --device=/dev/kvm --cap-add NET_ADMIN dockurr/w 


    - Now your Windows installation is ready for use. Enjoy it, and don't forget to star this repo!



  * ### How do I install an unsupported version?



    You can specify an URL in the `VERSION` environment variable, in order to download a custom ISO file:

    

    ```yaml

    environment:

      VERSION: "https://example.com/win.iso"

    ```

    

    During the installation you will need to add some drivers as described in [manual installation](https://github.com/dockur/windows/tree/master?tab=readme-ov-file#how-do-i-perform-a-manual-installation) above.



  * ### Is this project legal?



    Yes, this project contains only open-source code and does not distribute any copyrighted material. Neither does it try to circumvent any copyright protection measures. So under all applicable laws, this project would be considered legal.