Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docs improvements; Use PowerShell command to setx, fixes #2397 #2375

Merged
merged 5 commits into from
Jul 21, 2020

Conversation

rfay
Copy link
Member

@rfay rfay commented Jul 9, 2020

The Problem/Issue/Bug:

A set of docs improvements, will be batched for a while

How this PR Solves The Problem:

Manual Testing Instructions:

Automated Testing Overview:

Related Issue Link(s):

Release/Deployment notes:

@rfay rfay requested a review from gilbertsoft July 9, 2020 23:00
docs/index.md Outdated
9. **Docker Desktop for Windows:** If you already have the latest Docker Desktop, configure it in the General Settings to use the WSL2-based engine. Otherwise install the latest Docker Desktop for Windows and select the WSL2-based engine (not legacy Hyper-V) when installing. Install via Chocolatey with `choco install docker-desktop` or it can be downloaded from [download.docker.com](https://download.docker.com/win/stable/Docker%20for%20Windows%20Installer.exe). Start Docker. It may prompt you to log out and log in again, or reboot.
10. Go to Docker Desktop settings > Resources > WSL integration > enable integration for your distro (now `docker` commands will be available from within your WSL2 distro).
11. In git-bash, run the command `setx CAROOT "$(mkcert -CAROOT)" && setx WSLENV "CAROOT/up;$WSLENV"`. This will set WSL2 to use the Certificate Authority installed on the Windows side.
5. In PowerShell, run the command `setx CAROOT "$(mkcert -CAROOT)"; If ($Env:WSLENV -notlike "CAROOT") { setx WSLENV "CAROOT/up;$Env:WSLENV" }`. This will set WSL2 to use the Certificate Authority installed on the Windows side.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

* are missing here too, it should be $Env:WSLENV -notlike "*CAROOT*". Perhaps you need to escape them, not sure

docs/index.md Outdated Show resolved Hide resolved
@rfay rfay added this to the v1.15.1 milestone Jul 16, 2020
docs/index.md Outdated
9. **Docker Desktop for Windows:** If you already have the latest Docker Desktop, configure it in the General Settings to use the WSL2-based engine. Otherwise install the latest Docker Desktop for Windows and select the WSL2-based engine (not legacy Hyper-V) when installing. Install via Chocolatey with `choco install docker-desktop` or it can be downloaded from [download.docker.com](https://download.docker.com/win/stable/Docker%20for%20Windows%20Installer.exe). Start Docker. It may prompt you to log out and log in again, or reboot.
10. Go to Docker Desktop settings > Resources > WSL integration > enable integration for your distro (now `docker` commands will be available from within your WSL2 distro).
11. In git-bash, run the command `setx CAROOT "$(mkcert -CAROOT)" && setx WSLENV "CAROOT/up;$WSLENV"`. This will set WSL2 to use the Certificate Authority installed on the Windows side.
5. In PowerShell, run the command `setx CAROOT "$(mkcert -CAROOT)"; If ($Env:WSLENV -notlike "*CAROOT*") { setx WSLENV "CAROOT/up;$Env:WSLENV" }`. This will set WSL2 to use the Certificate Authority installed on the Windows side.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
5. In PowerShell, run the command `setx CAROOT "$(mkcert -CAROOT)"; If ($Env:WSLENV -notlike "*CAROOT*") { setx WSLENV "CAROOT/up;$Env:WSLENV" }`. This will set WSL2 to use the Certificate Authority installed on the Windows side.
5. In PowerShell, run the command `setx CAROOT "$(mkcert -CAROOT)"; If ($Env:WSLENV -notlike "*CAROOT*") { setx WSLENV "CAROOT/up:$Env:WSLENV" }`. This will set WSL2 to use the Certificate Authority installed on the Windows side.

@rfay rfay changed the title Docs improvements; Use PowerShell command to setx Docs improvements; Use PowerShell command to setx, fixes #2397 Jul 21, 2020
@rfay rfay merged commit daaeb25 into ddev:master Jul 21, 2020
@rfay rfay deleted the 20200709_docs_finesse branch July 21, 2020 22:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants