From 9c0c39845c454e212a92d29a7edd25bae6bb535d Mon Sep 17 00:00:00 2001 From: starbr3aker Date: Mon, 13 Jan 2025 23:17:06 +0530 Subject: [PATCH] Resolved comments --- README.md | 6 +++--- compose.yaml | 2 +- docs/docker.md | 11 +++-------- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 81530a8..30dfb43 100644 --- a/README.md +++ b/README.md @@ -435,9 +435,9 @@ FREERDP_COMMAND="" > If you wish to use an alternative WinApps backend (other than `Docker`), uncomment and change `WAFLAVOR="docker"` to `WAFLAVOR="podman"` or `WAFLAVOR="libvirt"`. > [!NOTE] -> If you encounter issues with tls certificate getting rejected, delete the existing `.pem` file with -> `rm -rf .config/freerdp/server/127.0.0.1_3389.pem` and run -> `xfreerdp3 /u:MyWindowsUser /p:MyWindowsPassword /v:127.0.0.1 /cert:tofu` +> If you encounter issues with tls certificate getting rejected, delete the existing `.pem` file with +> `rm ~/.config/freerdp/server/127.0.0.1_3389.pem` and run +> `xfreerdp3 /u:MyWindowsUser /p:MyWindowsPassword /v:127.0.0.1 /cert:tofu` > to set up Trust On First Authentication. Then retry the `setup.sh` script. #### Configuration Options Explained diff --git a/compose.yaml b/compose.yaml index c4fea0c..29d86b6 100644 --- a/compose.yaml +++ b/compose.yaml @@ -37,5 +37,5 @@ services: #- /path/to/windows/install/media.iso:/custom.iso # Uncomment to use a custom Windows ISO. If specified, 'VERSION' (e.g. 'tiny11') will be ignored. devices: - /dev/kvm # Enable KVM. - #- /dev/sdX:/disk1 # Uncomment to mount a disk directly within the Windows VM (Note: 'disk1' will be mounted as the main drive. THIS DISK WILL BE FORMATTED DURING COMPOSE). + #- /dev/sdX:/disk1 # Uncomment to mount a disk directly within the Windows VM (Note: 'disk1' will be mounted as the main drive. THIS DISK WILL BE FORMATTED BY DOCKER). #- /dev/sdY:/disk2 # Uncomment to mount a disk directly within the Windows VM (Note: 'disk2' and higher will be mounted as secondary drives THIS DISK WILL NOT BE FORMATTED). diff --git a/docs/docker.md b/docs/docker.md index 9b61336..7059bb5 100644 --- a/docs/docker.md +++ b/docs/docker.md @@ -7,7 +7,7 @@ Although WinApps supports using `QEMU+KVM+libvirt` as a backend for running Wind > [!IMPORTANT] > WinApps does __NOT__ officially support versions of Windows prior to Windows 10. Despite this, it may be possible to achieve a successful installation with some additional experimentation. If you find a way to achieve this, please share your solution through a pull request for the benefit of other users. > Possible setup instructions for Windows 10: -> - 'Professional', 'Enterprise' or 'Server' editions of Windows are required to run RDP applications. Windows 'Home' will NOT suffice. It is recommended to download the ISO from a reputed source, as the built in downloader from dockur (default set to `tiny11`) will take longer than it would to download from a browser/torrent. +> - 'Professional', 'Enterprise' or 'Server' editions of Windows are required to run RDP applications. Windows 'Home' will __NOT__ suffice. It is recommended to download the ISO from a reputed source, as the built in downloader from dockur (default set to `tiny11`) will take longer than it would to download from a browser/torrent. > - It is recommended to edit the initial `compose.yaml` file to keep your required username and password from the beginning. > - It is recommended to not use `sudo` to force commands to run. Add your user to the relevant permissions group wherever possible. @@ -30,14 +30,9 @@ It is also possible to specify the version of Windows you wish to install within Please refer to the [original GitHub repository](https://github.com/dockur/windows) for more information on additional configuration options. > [!NOTE] -> If you want to undo all your changes and start from scratch, run the following. For `podman`, replace `docker` with `podman`. +> If you want to undo all your changes and start from scratch, run the following. For `podman`, replace `docker` with `podman`. > ```bash -> docker ps # verify if you have any dockers created -> docker rm -v -f $(docker ps -qa) # will remove all running dockers (EXERCISE CAUTION) -> docker container ls # see if you have any containers running -> docker container rm containerName # to remove any old containers -> docker volume ls # for old volumes. Docker will reuse old volumes which may have previous installations of windows -> docker volume rm volumeName +> docker compose down --rmi=all --volumes > ``` ### Installing Windows