From 79d22e820a85dbe0111e4e6469c4558432de9cca Mon Sep 17 00:00:00 2001 From: Irrom <31070777+AstronomyGuy@users.noreply.github.com> Date: Sun, 8 Jan 2023 10:07:14 -0500 Subject: [PATCH 1/5] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fda7aa1a749..568b0e04c7a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - \[SDK\] The `resource_type` args now have the default value of `local` in task creation functions. The corresponding arguments are keyword-only now. () +- Windows Installation Instructions adjusted to work around https://github.com/nuclio/nuclio/issues/1821 ### Deprecated - TDB From a0d85d4c66c96f17b547c9696590ee62d950ca2e Mon Sep 17 00:00:00 2001 From: Irrom <31070777+AstronomyGuy@users.noreply.github.com> Date: Sun, 8 Jan 2023 10:28:22 -0500 Subject: [PATCH 2/5] Update installation.md --- site/content/en/docs/administration/basics/installation.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/site/content/en/docs/administration/basics/installation.md b/site/content/en/docs/administration/basics/installation.md index 84bde0ac94ec..ca840e0819ae 100644 --- a/site/content/en/docs/administration/basics/installation.md +++ b/site/content/en/docs/administration/basics/installation.md @@ -127,8 +127,7 @@ For access from China, read [sources for users from China](#sources-for-users-fr ## Windows 10 - Install WSL2 (Windows subsystem for Linux) refer to [this official guide](https://docs.microsoft.com/windows/wsl/install-win10). - WSL2 requires Windows 10, version 2004 or higher. Note: You may not have to install a Linux distribution unless - needed. + WSL2 requires Windows 10, version 2004 or higher. After installing WSL2, install a Linux Distribution of your choice. - Download and install [Docker Desktop for Windows](https://desktop.docker.com/win/main/amd64/Docker%20Desktop%20Installer.exe). Double-click `Docker for Windows Installer` to run the installer. @@ -145,7 +144,7 @@ For access from China, read [sources for users from China](#sources-for-users-fr - Download and install [Google Chrome](https://www.google.com/chrome/). It is the only browser which is supported by CVAT. -- Go to windows menu, find `Git Bash` application and run it. You should see a terminal window. +- Go to windows menu, find the Linux distribution you installed and run it. You should see a terminal window. - Clone _CVAT_ source code from the [GitHub repository](https://github.com/opencv/cvat). @@ -183,7 +182,7 @@ For access from China, read [sources for users from China](#sources-for-users-fr below: ```shell - winpty docker exec -it cvat_server bash -ic 'python3 ~/manage.py createsuperuser' + sudo docker exec -it cvat_server bash -ic 'python3 ~/manage.py createsuperuser' ``` If you don't have winpty installed or the above command does not work, you may also try the following: From 856058fca6b1a8100355401ad7f16ca0a5cf6d85 Mon Sep 17 00:00:00 2001 From: Nikita Manovich Date: Mon, 9 Jan 2023 23:02:43 +0200 Subject: [PATCH 3/5] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 568b0e04c7a7..1ef4ca90c7d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,7 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - \[SDK\] The `resource_type` args now have the default value of `local` in task creation functions. The corresponding arguments are keyword-only now. () -- Windows Installation Instructions adjusted to work around https://github.com/nuclio/nuclio/issues/1821 +- Windows Installation Instructions adjusted to work around ### Deprecated - TDB From ec001309965a467a68051419d17100cbcee4c739 Mon Sep 17 00:00:00 2001 From: Irrom <31070777+AstronomyGuy@users.noreply.github.com> Date: Mon, 9 Jan 2023 19:26:10 -0500 Subject: [PATCH 4/5] Add WSL Integration step --- site/content/en/docs/administration/basics/installation.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/content/en/docs/administration/basics/installation.md b/site/content/en/docs/administration/basics/installation.md index ca840e0819ae..9c7d919273de 100644 --- a/site/content/en/docs/administration/basics/installation.md +++ b/site/content/en/docs/administration/basics/installation.md @@ -136,6 +136,8 @@ For access from China, read [sources for users from China](#sources-for-users-fr [here](https://docs.docker.com/docker-for-windows/wsl/). Note: Check that you are specifically using WSL2 backend for Docker. +- In Docker Desktop, go to `Settings >> Resources >> WSL Integration`, and enable integration with the Linux Distribution that you chose. + - Download and install [Git for Windows](https://github.com/git-for-windows/git/releases/download/v2.21.0.windows.1/Git-2.21.0-64-bit.exe). When installing the package please keep all options by default. From d718588cc40f9c8eef5269230b7185df23571522 Mon Sep 17 00:00:00 2001 From: Nikita Manovich Date: Tue, 10 Jan 2023 13:12:38 +0200 Subject: [PATCH 5/5] fix linter warnings --- site/content/en/docs/administration/basics/installation.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/site/content/en/docs/administration/basics/installation.md b/site/content/en/docs/administration/basics/installation.md index 9c7d919273de..2fe1f4b299d8 100644 --- a/site/content/en/docs/administration/basics/installation.md +++ b/site/content/en/docs/administration/basics/installation.md @@ -136,7 +136,8 @@ For access from China, read [sources for users from China](#sources-for-users-fr [here](https://docs.docker.com/docker-for-windows/wsl/). Note: Check that you are specifically using WSL2 backend for Docker. -- In Docker Desktop, go to `Settings >> Resources >> WSL Integration`, and enable integration with the Linux Distribution that you chose. +- In Docker Desktop, go to `Settings >> Resources >> WSL Integration`, and +enable integration with the Linux Distribution that you chose. - Download and install [Git for Windows](https://github.com/git-for-windows/git/releases/download/v2.21.0.windows.1/Git-2.21.0-64-bit.exe).